diff --git a/src/gui/ncc/Menu.cpp b/src/gui/ncc/Menu.cpp
index 3899d49b..abf26444 100644
--- a/src/gui/ncc/Menu.cpp
+++ b/src/gui/ncc/Menu.cpp
@@ -580,7 +580,6 @@ static const std::string list_tf2 = R"(
         "log"
     ]
 ]
-<<<<<<< HEAD
 )";
 
 List& MainList() {