border dispute diplomacy