diff --git a/Server/Extensions/ClientExtension.cs b/Server/Extensions/ClientExtension.cs
index 72022f84..65147ac8 100644
--- a/Server/Extensions/ClientExtension.cs
+++ b/Server/Extensions/ClientExtension.cs
@@ -19,11 +19,8 @@ namespace reallife_gamemode.Server.Extensions
     {
         public static User GetUser(this Client client, DatabaseContext context = null)
         {
-<<<<<<< HEAD
-            if (!client.IsLoggedIn()) return null;
-=======
 
->>>>>>> feature/client-player-keys
+            if (!client.IsLoggedIn()) return null;
             using (DatabaseContext dbContext = new DatabaseContext())
             if(context == null)
             {
@@ -40,29 +37,7 @@ namespace reallife_gamemode.Server.Extensions
 
         public static bool IsLoggedIn(this Client player)
         {
-<<<<<<< HEAD
             return player.HasData("isLoggedIn") ? player.GetData("isLoggedIn") : false;
-=======
-            if(context == null)
-            {
-                using(context = new DatabaseContext())
-                {
-                    User u = client.GetUser();
-                    if (u == null) return null;
-                    return u.GetFaction();
-                }
-            }
-            else
-            {
-                User u = client.GetUser();
-                if (u == null) return null;
-                return u.GetFaction();
-            }
-        }
-
-        public static bool IsLoggedIn(Client player)
-        {
-            return player.GetData("isLoggedIn");
         }
 
         public static void BanPlayer(Client admin, Client target, string reason, int mins)
@@ -103,7 +78,6 @@ namespace reallife_gamemode.Server.Extensions
             }
             admin.SendChatMessage(target.Name + " wurde entbannt.");
             //TODO ***Admin Info: {ADMIN-NAME} hat {USER-NAME} entbannt.
->>>>>>> feature/client-player-keys
         }
     }
 }