Solve merge conflicts

Author: sweiland-openrails

Source/Menu/Properties/launchSettings.json

@@ -0,0 +1,10 @@
+{
+  "profiles": {
+    "Menu": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "TstLoadContentAndInstalled": "1"
+      }
+    }
+  }
+}