diff --git a/queryserv/worldserver.cpp b/queryserv/worldserver.cpp
index ef75740e7..955169871 100644
--- a/queryserv/worldserver.cpp
+++ b/queryserv/worldserver.cpp
@@ -26,11 +26,7 @@
 extern WorldServer           worldserver;
 extern const queryservconfig *Config;
 extern QSDatabase            qs_database;
-<<<<<<< kinglykrab/lfguildmanager-global-to-singleton
-=======
-extern LFGuildManager        lfguildmanager;
 extern ZSList                zs_list;
->>>>>>> master
 
 WorldServer::WorldServer()
 {