Solve merge conflicts

Author: sweiland-openrails

Source/ORTS.Settings/UserSettings.cs

@@ -479,6 +479,7 @@ public string DirectXFeatureLevel
         public int OSDCarsState { get; set; }
         [Default(0)] // TrackMonitor.DisplayMode.All
         public int TrackMonitorDisplayMode { get; set; }
+
         #endregion
 
         public FolderSettings Folders { get; private set; }