solve merge conflict

Author: sweiland-openrails

Source/Menu/Options.cs

@@ -744,8 +744,14 @@ private void textBoxContentName_TextChanged(object sender, EventArgs e)
             var current = bindingSourceContent.Current as ContentFolder;
             if (current != null && current.Name != textBoxContentName.Text)
             {
-                if (ContentFolder.isWrongPath(current.Path, catalog))
+                if (current.Path.ToLower().Contains(ApplicationInfo.ProcessDirectory.ToLower()))
                 {
+                    // Block added because a succesful Update operation will empty the Open Rails folder and lose any content stored within it.
+                    MessageBox.Show(catalog.GetString
+                        ($"Cannot use content from any folder which lies inside the Open Rails folder {ApplicationInfo.ProcessDirectory}\n\n")
+                        , "Invalid content location"
+                        , MessageBoxButtons.OK
+                        , MessageBoxIcon.Error);
                     DeleteContent();
                     return;
                 }