diff --git a/src/Client/Systems/Menus/Menu/ButtonCallbacks.hpp b/src/Client/Systems/Menus/Menu/ButtonCallbacks.hpp
index 06c630a2..4e625d79 100644
--- a/src/Client/Systems/Menus/Menu/ButtonCallbacks.hpp
+++ b/src/Client/Systems/Menus/Menu/ButtonCallbacks.hpp
@@ -71,7 +71,6 @@ namespace Menu {
         void createServer();
 
         const std::unordered_map<CallbackType, std::function<void()>> callbacks = {
-<<<<<<< HEAD
             {CallbackType::DEFAULT_CALLBACK, &defaultCallBack                 },
             {CallbackType::INIT_CONNECTION,  &initConnection                  },
             {CallbackType::CONNECT,          &connectLobbySelected            },
@@ -84,28 +83,6 @@ namespace Menu {
             {CallbackType::GO_CREATE_SERVER,       &goCreateServer                },
             {CallbackType::CREATE_SERVER,       &createServer                },
             {CallbackType::GO_MENU,       &goMenu,                }
-=======
-            {CallbackType::DEFAULT_CALLBACK, &defaultCallBack},
-            {CallbackType::INIT_CONNECTION, &initConnection},
-            {CallbackType::CONNECT, &connectLobbySelected},
-            {CallbackType::CREATE, &onButtonGotoCreateLobbyClicked},
-            {CallbackType::GO_SELECT_LOBBY, &gotToSelectLobby},
-            {CallbackType::GO_BACK, &goBackPage},
-            {CallbackType::GO_NEXT, &goNextPage},
-            {CallbackType::CREATE_NORMAL, &onButtonCreateLobbyNormalClicked},
-            {
-             CallbackType::SEND_READY,
-             &sendReadyPacket,
-             },
-            {
-             CallbackType::GO_CREATE_SERVER,
-             &goCreateServer,
-             },
-            {
-             CallbackType::CREATE_SERVER,
-             &createServer,
-             }
->>>>>>> ce7792df03b6132b68c41482bd45eb67351b538d
         };
     } // namespace Callback
 } // namespace Menu