Resolve merge conflict

Client/index.js

@@ -7,7 +7,8 @@
 let globalData = {
     InTuning: false,
     HideGui: false,
-    PlayerInteraction: false
+    PlayerInteraction: false,
+    InChat: false
 };
 
 mp.game.gameplay.enableMpDlcMaps(true);
@@ -30,6 +31,7 @@ require('./Gui/nametags.js');
 require('./Gui/playerlist.js');
 require('./Gui/Inventory/inventory.js');
 require('./Gui/vehiclemenu/main.js');
+require('./Gui/interiors.js');
 
 require('./Interaction/interaction.js');
 
@@ -47,4 +49,5 @@ require('./Tuning/main.js');
 require('./Tuning/sync.js');
 require('./Tuning/sirensilence.js');
 
-require('./vehiclesync/vehiclesync.js');
+require('./vehiclesync/vehiclesync.js');
+require('./vehiclesync/smoothtrottle.js');