The meeting will follow months of back-and-forth diplomacy to smooth over disagreements and set stage for first interaction since they sat down together in Bali, Indonesia last year