border dispute history