merged water and enemy changes