diff --git a/src/lua/gameserver.lua b/src/lua/gameserver.lua
index 8d89161..ea5b9ba 100644
--- a/src/lua/gameserver.lua
+++ b/src/lua/gameserver.lua
@@ -156,10 +156,5 @@ end)
 
 
 
-<<<<<<< HEAD
 -- StartGame -- 
-=======
-------------------------------END START GAME SHARED SCRIPT--------------------------
-
->>>>>>> master
 game:GetService("RunService"):Run()