The nations' decades-long border dispute erupted into several rounds of clashes last year, killing dozens of people and displacing more than a million in July and December.