water in river mesh
fix conflicts
fix error