border dispute resolved