Longstanding border disputes erupted into five days of combat in July that killed dozens of soldiers and civilians.