diff --git a/Client/Player/keys.js b/Client/Player/keys.js
new file mode 100644
index 00000000..d39d67ff
--- /dev/null
+++ b/Client/Player/keys.js
@@ -0,0 +1,37 @@
+/**
+ * @overview Life of German Reallife - Player Keys keys.js
+ * @author VegaZ
+ * @copyright (c) 2008 - 2018 Life of German
+ */
+
+//https://docs.microsoft.com/de-de/windows/desktop/inputdev/virtual-key-codes
+
+var chat = false;
+
+//ENTER
+mp.keys.bind(0x0D, false, function () {
+    if (chat === true) {
+        chat = false;
+    }
+});
+
+//N
+mp.keys.bind(0x4E, false, function () {
+    if (!chat) {
+        mp.events.callRemote("keyPress:N");
+    }
+});
+
+//T
+mp.keys.bind(0x54, false, function () {
+    if (chat === false) {
+        chat = true;
+    }
+});
+
+//X
+mp.keys.bind(0x58, false, function () {
+    if (!chat) {
+        mp.events.callRemote("keyPress:X");
+    }
+});
diff --git a/Client/index.js b/Client/index.js
index a0b043e1..a494dc53 100644
--- a/Client/index.js
+++ b/Client/index.js
@@ -6,6 +6,7 @@
 
 require('./Gui/infobox.js');
 require('./Login/main.js');
+require('./Player/keys.js');
 require('./Save/main.js');
 
 require('./FactionManagement/main.js');
diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs
index e1d95689..a88c4c11 100644
--- a/Server/Commands/Admin.cs
+++ b/Server/Commands/Admin.cs
@@ -665,7 +665,7 @@ namespace reallife_gamemode.Server.Commands
                     {
                         Vehicle vehicle = player.Vehicle;
                         SaveData.SaveVehicleData((VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate,
-                            Convert.ToByte(vehicle.PrimaryColor), Convert.ToByte(vehicle.SecondaryColor), vehicle.Locked, vehicle.EngineStatus, Convert.ToByte(vehicle.Dimension));
+                            Convert.ToByte(vehicle.PrimaryColor), Convert.ToByte(vehicle.SecondaryColor), vehicle.Locked, Convert.ToByte(vehicle.Dimension));
                     }
                     else player.SendChatMessage("~m~Du sitzt in keinem Fahrzeug!");
                     break;               
diff --git a/Server/Events/Key.cs b/Server/Events/Key.cs
new file mode 100644
index 00000000..f38999c9
--- /dev/null
+++ b/Server/Events/Key.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using GTANetworkAPI;
+/**
+* @overview Life of German Reallife - Event Key (Key.cs)
+* @author VegaZ
+* @copyright (c) 2008 - 2018 Life of German
+*/
+
+namespace reallife_gamemode.Server.Events
+{
+    public class Key : Script
+    {
+        [RemoteEvent("keyPress:N")]
+        public void KeyPressN(Client player)
+        {
+            if (NAPI.Player.IsPlayerInAnyVehicle(player))
+            {
+                bool engineStatus = NAPI.Vehicle.GetVehicleEngineStatus(player.Vehicle);
+                if (engineStatus == false)
+                {
+                    player.Vehicle.EngineStatus = true;
+                }
+                else
+                {
+                    player.Vehicle.EngineStatus = false;
+                }
+            }
+        }
+        [RemoteEvent("keyPress:X")]
+        public void KeyPressX(Client player)
+        {
+            if (NAPI.Player.IsPlayerInAnyVehicle(player))
+            {
+                if (player.Seatbelt == false)
+                {
+                    player.Seatbelt = true;
+                }
+                else
+                {
+                    player.Seatbelt = false;
+                }
+            }
+        }
+    }
+}
diff --git a/Server/Events/SaveData.cs b/Server/Events/SaveData.cs
index 01d32054..76df8990 100644
--- a/Server/Events/SaveData.cs
+++ b/Server/Events/SaveData.cs
@@ -50,7 +50,7 @@ namespace reallife_gamemode.Server.Events
         }
 
         public static void SaveVehicleData(VehicleHash vehicleModel, Vector3 vehiclePosition, float vehicleHeading,
-            string vehicleNumberPlate, byte vehiclePrimaryColor, byte vehicleSecondaryColor, bool vehicleLocked, bool vehicleEngine, byte vehicleDimension)
+            string vehicleNumberPlate, byte vehiclePrimaryColor, byte vehicleSecondaryColor, bool vehicleLocked, byte vehicleDimension)
         {
             using (var saveData = new Model.DatabaseContext())
             {
@@ -65,7 +65,7 @@ namespace reallife_gamemode.Server.Events
                     PrimaryColor = vehiclePrimaryColor,
                     SecondaryColor = vehicleSecondaryColor,
                     Locked = vehicleLocked,
-                    Engine = vehicleEngine,
+                    Engine = false,
                     Dimension = vehicleDimension,
                     Active = true
                 };
diff --git a/Server/Extensions/ClientExtension.cs b/Server/Extensions/ClientExtension.cs
index c2b2e405..ab2762db 100644
--- a/Server/Extensions/ClientExtension.cs
+++ b/Server/Extensions/ClientExtension.cs
@@ -19,11 +19,9 @@ namespace reallife_gamemode.Server.Extensions
     {
         public static User GetUser(this Client client, DatabaseContext context = null)
         {
-<<<<<<< HEAD
+
             using (DatabaseContext dbContext = new DatabaseContext())
-=======
             if(context == null)
->>>>>>> feature/faction-system
             {
                 using (context = new DatabaseContext())
                 {
@@ -92,7 +90,7 @@ namespace reallife_gamemode.Server.Extensions
         {
             using (var unbanUser = new DatabaseContext())
             {
-                var targetUser = unbanUser.Bans.FirstOrDefault(u => u.Id == target.GetUser().BanId);
+                var targetUser = unbanUser.Bans.FirstOrDefault(u => u.Id == target.GetUser(unbanUser).BanId);
                 unbanUser.Bans.Remove(targetUser);
                 unbanUser.SaveChanges();
             }
diff --git a/Server/Services/ChatService.cs b/Server/Services/ChatService.cs
index bbd22361..4eaad24c 100644
--- a/Server/Services/ChatService.cs
+++ b/Server/Services/ChatService.cs
@@ -27,7 +27,6 @@ namespace reallife_gamemode.Server.Services
             player.SendChatMessage("~r~[FEHLER]~s~ Der Spieler wurde nicht gefunden.");
         }
 
-<<<<<<< HEAD
         public static void PlayerNotLoggedIn(Client player)
         {
             player.SendChatMessage("~r~[FEHLER]~s~ Du bist nicht eingeloggt.");
@@ -35,7 +34,7 @@ namespace reallife_gamemode.Server.Services
         public static void ErrorMsg(Client player)
         {
             player.SendChatMessage("~r~[FEHLER]~s~ Die Aktion wurde nicht ausgeführt.");
-=======
+        }
         public static void BroadcastFaction(string message, List<Faction> factions)
         {
             using (var dbCon = new DatabaseContext())
@@ -57,7 +56,6 @@ namespace reallife_gamemode.Server.Services
         public static void BroadcastFaction(string message, Faction faction)
         {
             BroadcastFaction(message, new List<Faction> { faction });
->>>>>>> feature/faction-system
         }
     }
 }