Try

Client/Player/keys.js

@@ -7,11 +7,8 @@
 //https://docs.microsoft.com/de-de/windows/desktop/inputdev/virtual-key-codes
 
 var chat = false;
-<<<<<<< HEAD
 var showInventory = false;
-=======
 var showGui = true;
->>>>>>> develop
 
 //ENTER
 mp.keys.bind(0x0D, false, function () {
@@ -53,7 +50,6 @@ mp.keys.bind(0x49, false, function () {
     }
 });
 
-<<<<<<< HEAD
 //J
 mp.keys.bind(0x4A, false, function () {
     if (showInventory === false) {
@@ -65,8 +61,6 @@ mp.keys.bind(0x4A, false, function () {
     }  
 });
 
-//N
-=======
 //K //Dienstkleidung
 mp.keys.bind(0x4B, false, function () {
     if (!chat) {
@@ -82,7 +76,6 @@ mp.keys.bind(0x4C, false, function () {
 });
 
 //N //Motor Starten
->>>>>>> develop
 mp.keys.bind(0x4E, false, function () {
     if (!chat) {
         mp.events.callRemote("keyPress:N");