Long-running land dispute settled