Strange commit

Not sure what went wrong. This is the fixed files.

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
     }
 ]