The two nations have been locked in a decades-long conflict over their contested border. Tensions in disputed territories soured earlier this year.