Assam-Meghalaya border dispute resolved