Three villages exchanged in latest move to end border dispute