diff --git a/server/network/webhooks.py b/server/network/webhooks.py
index 8a70128e..962eb959 100644
--- a/server/network/webhooks.py
+++ b/server/network/webhooks.py
@@ -91,7 +91,6 @@ def modcall(self, char, ipid, area, reason=None):
             description=description,
         )
 
-<<<<<<< modpass-log
     def login(self, client=None, loginprofile=""):
         if "login_webhook" not in self.server.config:
             return
@@ -106,7 +105,7 @@ def login(self, client=None, loginprofile=""):
 
         self.send_webhook(username=username,
                           avatar_url=avatar_url, message=message)
-=======
+
     def needcall(self, client=None, reason=None):
         if "need_webhook" not in self.server.config:
             return
@@ -140,7 +139,7 @@ def needcall(self, client=None, reason=None):
             description=description,
             url=url,
         )
->>>>>>> master
+
 
     def kick(self, ipid, reason="", client=None, char=None):
         is_enabled = self.server.config["kick_webhook"]["enabled"]