diff --git a/backend/IMTest/obj/Debug/net8.0/IMTest.AssemblyInfo.cs b/backend/IMTest/obj/Debug/net8.0/IMTest.AssemblyInfo.cs
index 8145089..568afa5 100644
--- a/backend/IMTest/obj/Debug/net8.0/IMTest.AssemblyInfo.cs
+++ b/backend/IMTest/obj/Debug/net8.0/IMTest.AssemblyInfo.cs
@@ -14,7 +14,11 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("IMTest")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+<<<<<<< HEAD
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+eb8455e141ea496a2134ad7c7d9b759b6029dd75")]
+=======
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f7223dc5904286fdf8e117b56c37f58dc431d68b")]
+>>>>>>> eb8455e141ea496a2134ad7c7d9b759b6029dd75
 [assembly: System.Reflection.AssemblyProductAttribute("IMTest")]
 [assembly: System.Reflection.AssemblyTitleAttribute("IMTest")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/backend/IMTest/obj/Debug/net8.0/IMTest.AssemblyInfoInputs.cache b/backend/IMTest/obj/Debug/net8.0/IMTest.AssemblyInfoInputs.cache
index 2827c86..c1ab4c0 100644
--- a/backend/IMTest/obj/Debug/net8.0/IMTest.AssemblyInfoInputs.cache
+++ b/backend/IMTest/obj/Debug/net8.0/IMTest.AssemblyInfoInputs.cache
@@ -1 +1,5 @@
+<<<<<<< HEAD
 546570633bb9288fc2957cbb29a807a45f3e48ba127ec13bc3956d28f5e6ed5b
+=======
+3c0a5335719f892c65744a9df7eae9fd7b12de9067131f5c9f4cb65f2b27b8d4
+>>>>>>> eb8455e141ea496a2134ad7c7d9b759b6029dd75
diff --git a/frontend/pc/IM/.env b/frontend/pc/IM/.env
index ea10082..12da4fe 100644
--- a/frontend/pc/IM/.env
+++ b/frontend/pc/IM/.env
@@ -1,8 +1,8 @@
-# VITE_API_BASE_URL = http://localhost:5202/api
-# VITE_SIGNALR_BASE_URL = http://localhost:5202/chat/
+VITE_API_BASE_URL = http://localhost:5202/api
+VITE_SIGNALR_BASE_URL = http://localhost:5202/chat/
 # VITE_API_BASE_URL = https://im.test.nxsir.cn/api
 # VITE_SIGNALR_BASE_URL = https://im.test.nxsir.cn/chat/
 
 
-VITE_API_BASE_URL = http://192.168.5.116:7070/api
-VITE_SIGNALR_BASE_URL = http://192.168.5.116:7070/chat/
+# VITE_API_BASE_URL = http://192.168.5.116:7070/api
+# VITE_SIGNALR_BASE_URL = http://192.168.5.116:7070/chat/
diff --git a/frontend/pc/IM/src/renderer/src/components/WindowControls.vue b/frontend/pc/IM/src/renderer/src/components/WindowControls.vue
index 6b9a3dc..b0e0462 100644
--- a/frontend/pc/IM/src/renderer/src/components/WindowControls.vue
+++ b/frontend/pc/IM/src/renderer/src/components/WindowControls.vue
@@ -50,6 +50,7 @@ function toggleMaximize() {
 function close() {
   window.api.window.close()
   emits('close')
+  emits('close')
 }
 </script>