diff --git a/src/object/player.cpp b/src/object/player.cpp
index d90b646541b..9ff9af7be67 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -515,7 +515,6 @@ Player::update(float dt_sec)
         if (m_physic.get_velocity_y() > -350.f && m_controller->hold(Control::UP))
           m_physic.set_velocity_y(-350.f);
       }
-<<<<<<< HEAD
 
       if (m_bubble_timer.check())
       {
@@ -578,8 +577,6 @@ Player::update(float dt_sec)
           bool is_out_of_water = Sector::get().is_free_of_tiles(bubble_box, true, Tile::WATER);
           return is_out_of_water;
         }), m_active_bubbles.end());
-=======
->>>>>>> parent of f5eea9bed (Add bubbles while being underwater)
     }
     else
     {