diff --git a/wurm-unlimited.kvp b/wurm-unlimited.kvp
index ecbb1eb..ae1fed2 100644
--- a/wurm-unlimited.kvp
+++ b/wurm-unlimited.kvp
@@ -1,17 +1,11 @@
 App.AdminMethod=STDIO
 App.ApplicationPort1=8766
 App.ApplicationPort2=27016
-<<<<<<< Updated upstream
-App.ApplicationReadyMode=RegexMatch
-App.BaseDirectory=./wurm-unlimited/402370/
-App.CommandLineArgs=ip={{$ApplicationIPBinding}} externalport={{$ApplicationPort1}} queryport={{$ApplicationPort2}} {{$FormattedArgs}}
-=======
 App.ApplicationPort3=0
 App.RemoteAdminPort=0
 App.ApplicationReadyMode=RegexMatch
 App.BaseDirectory=./wurm-unlimited/402370/
 App.CommandLineArgs=ip="{{$ApplicationIPBinding}}" externalport="{{$ApplicationPort1}}" queryport="{{$ApplicationPort2}}" {{$FormattedArgs}}
->>>>>>> Stashed changes
 App.LinuxCommandLineArgs=
 App.WindowsCommandLineArgs=
 App.CommandLineParameterDelimiter= 
@@ -27,11 +21,7 @@ App.HasWritableConsole=false
 App.RapidStartup=false
 App.RootDir=./wurm-unlimited/
 App.UpdateSource=Multi
-<<<<<<< Updated upstream
-App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":31,"UpdateSource":4,"UpdateSourceData":"402370","UpdateSourceArgs":null,"UpdateSourceVersion":null,"UpdateSourceTarget":null,"UnzipUpdateSource":false,"OverwriteExistingFiles":false,"ForceDownloadPlatform":0,"UpdateSourceConditionSetting":null,"UpdateSourceConditionValue":null}]
-=======
 App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":31,"UpdateSource":4,"UpdateSourceData":"402370","UpdateSourceArgs":null,"UpdateSourceVersion":null,"UpdateSourceTarget":null,"UnzipUpdateSource":false,"OverwriteExistingFiles":false,"ForceDownloadPlatform":0,"UpdateSourceConditionSetting":null,"UpdateSourceConditionValue":null},{"UpdateStageName":"Start Server","UpdateSourcePlatform":"All","UpdateSource":"StartApplication"},{"UpdateStageName":"Wait For Server Start","UpdateSourcePlatform":"All","UpdateSource":"WaitForStartupComplete"},{"UpdateStageName":"Stop Server","UpdateSourcePlatform":"All","UpdateSource":"ShutdownApplication"}]
->>>>>>> Stashed changes
 App.WorkingDir=402370
 App.MaxUsers=100
 Console.ThrowawayMessageRegex=^(WARNING|ERROR): Shader.+$
diff --git a/wurm-unlimitedconfig.json b/wurm-unlimitedconfig.json
index 87708e7..a057e54 100644
--- a/wurm-unlimitedconfig.json
+++ b/wurm-unlimitedconfig.json
@@ -175,11 +175,7 @@
     {
         "DisplayName": "Memory Limit",
         "Category": "Server Settings",
-<<<<<<< Updated upstream
-        "Description": "Java's maximum heap size",
-=======
         "Description": "Java's maximum heap size (Must include ####m at the end)",
->>>>>>> Stashed changes
         "Keywords": "maximum,memory,limit",
         "FieldName": "MaxHeapSize",
         "InputType": "text",
@@ -199,8 +195,6 @@
         "ParamFieldName": "VMParams.JvmParam0",
         "IncludeInCommandLine": false,
         "DefaultValue": "-XX:+AggressiveOpts",
-<<<<<<< Updated upstream
-=======
     },
     {
         "DisplayName": "Override Java Location",
@@ -229,6 +223,5 @@
         "ParamFieldName": "Runtime.JavaPath",
         "IncludeInCommandLine": false,
         "DefaultValue": "C:\\Program Files\\Java\\jre1.8.0_321\\bin\\server",
->>>>>>> Stashed changes
     }
 ]
\ No newline at end of file