fixed water collision
fixed merge