Border guards' dispute resolved