<p>The two countries are mending ties after a decades-long territorial dispute.</p>