fixing water merge issues in 661 dataset