diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 1207a51..2701662 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -129,15 +129,11 @@ void Player::InternalUpdate(int delta_time)
         if (has_use_item_id) {
             UpdateUseItemId();
         }
-<<<<<<< HEAD
         UpdateViewObjects();
-      }
-=======
         if (playing_skill) {
             UpdateSkill();
         }
     }
->>>>>>> dev
 }
 
 void Player::UpdateMove()