Boundary dispute resolved between neighbours in Claygate