Water point merge issues fixing