diff --git a/lgsm/config-default/config-lgsm/inssserver/_default.cfg b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
index 774032326..b21ed6691 100644
--- a/lgsm/config-default/config-lgsm/inssserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
@@ -22,9 +22,9 @@ maxplayers="28"
 fn_parms(){
 	# Allows serverpassword to work with parameters
 	if [ "${serverpassword}" != "NOT SET" ]; then
-	parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport}?password="${serverpassword}" -hostname="${servername}" -log"
+		parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport}?password="${serverpassword}" -hostname="${servername}" -log"
 	else
-	parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport} -hostname="${servername}" -log"
+		parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport} -hostname="${servername}" -log"
 	fi
 }
 
diff --git a/lgsm/config-default/config-lgsm/kf2server/_default.cfg b/lgsm/config-default/config-lgsm/kf2server/_default.cfg
index 4b68e9661..f0c546f6b 100644
--- a/lgsm/config-default/config-lgsm/kf2server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/kf2server/_default.cfg
@@ -137,20 +137,10 @@ stopmode="2"
 querymode="2"
 querytype="protocol-valve"
 
-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="no"
 
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Killing Floor 2"
diff --git a/lgsm/config-default/config-lgsm/kfserver/_default.cfg b/lgsm/config-default/config-lgsm/kfserver/_default.cfg
index 85c499f18..38964223b 100644
--- a/lgsm/config-default/config-lgsm/kfserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/kfserver/_default.cfg
@@ -143,20 +143,10 @@ stopmode="2"
 querymode="2"
 querytype="protocol-unreal2"
 
-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="no"
 
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Killing Floor"
diff --git a/lgsm/config-default/config-lgsm/mhserver/_default.cfg b/lgsm/config-default/config-lgsm/mhserver/_default.cfg
index ddd263c3d..7c8163bed 100644
--- a/lgsm/config-default/config-lgsm/mhserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/mhserver/_default.cfg
@@ -139,20 +139,10 @@ stopmode="2"
 querymode="2"
 querytype="protocol-valve"
 
-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="no"
 
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="MORDHAU"
diff --git a/lgsm/config-default/config-lgsm/mohaaserver/_default.cfg b/lgsm/config-default/config-lgsm/mohaaserver/_default.cfg
index 405c2235b..b625221fe 100644
--- a/lgsm/config-default/config-lgsm/mohaaserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/mohaaserver/_default.cfg
@@ -124,20 +124,10 @@ stopmode="3"
 querymode="2"
 querytype="protocol-quake3"
 
-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="no"
 
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Medal of Honor: Allied Assault"
diff --git a/lgsm/config-default/config-lgsm/qlserver/_default.cfg b/lgsm/config-default/config-lgsm/qlserver/_default.cfg
index 040775f76..49b8c1e0e 100644
--- a/lgsm/config-default/config-lgsm/qlserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/qlserver/_default.cfg
@@ -131,20 +131,10 @@ stopmode="3"
 querymode="2"
 querytype="protocol-valve"
 
-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="yes"
 
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Quake Live"
diff --git a/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg b/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg
index 2e7317ed2..99da25df5 100644
--- a/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ricochetserver/_default.cfg
@@ -139,20 +139,10 @@ stopmode="9"
 querymode="2"
 querytype="protocol-valve"
 
-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="yes"
 
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Ricochet"
diff --git a/lgsm/config-default/config-lgsm/roserver/_default.cfg b/lgsm/config-default/config-lgsm/roserver/_default.cfg
index a2367ece4..03d819bcd 100644
--- a/lgsm/config-default/config-lgsm/roserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/roserver/_default.cfg
@@ -139,20 +139,10 @@ stopmode="2"
 querymode="2"
 querytype="protocol-unreal2"
 
-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="no"
 
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Red Orchestra: Ostfront 41-45"
diff --git a/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg b/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg
index b83bd8baa..dcd0d4211 100644
--- a/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ut2k4server/_default.cfg
@@ -123,20 +123,10 @@ stopmode="2"
 querymode="2"
 querytype="protocol-unreal2"
 
-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="no"
 
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Unreal Tournament 2004"
diff --git a/lgsm/config-default/config-lgsm/ut99server/_default.cfg b/lgsm/config-default/config-lgsm/ut99server/_default.cfg
index 33bfb9300..ab74b3f0b 100644
--- a/lgsm/config-default/config-lgsm/ut99server/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ut99server/_default.cfg
@@ -123,20 +123,10 @@ stopmode="2"
 querymode="2"
 querytype="protocol-gamespy1"
 
-<<<<<<< Updated upstream
-## Console type
-consoleverbose=""
-consoleinteract=""
-
-=======
-<<<<<<< Updated upstream
-=======
 ## Console type
 consoleverbose="yes"
 consoleinteract="no"
 
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 ## Game Server Details
 # Do not edit
 gamename="Unreal Tournament 99"