Handling of the water bomb
Solved merge conflicts