fix more merge errors

MareSynchronos/UI/CompactUI.cs

@@ -55,23 +55,6 @@ namespace MareSynchronos.UI
 #endif
             Logger.Verbose("Creating " + nameof(CompactUi));
 
-#if DEBUG
-            string dateTime = "DEV VERSION";
-            try
-            {
-                dateTime = VariousExtensions.GetLinkerTime(Assembly.GetCallingAssembly()).ToString("yyyyMMddHHmmss");
-            }
-            catch (Exception ex)
-            {
-                Logger.Warn("Could not get assembly name");
-                Logger.Warn(ex.Message);
-                Logger.Warn(ex.StackTrace);
-            }
-            this.WindowName = "Mare Synchronos " + dateTime + "###MareSynchronosMainUI";
-#else
-            this.WindowName = "Mare Synchronos " + Assembly.GetExecutingAssembly().GetName().Version + "###MareSynchronosMainUI";
-#endif
-
             _windowSystem = windowSystem;
             _uiShared = uiShared;
             _configuration = configuration;