diff --git a/vite.config.js b/vite.config.js
index 279d8917..2ecced33 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -18,13 +18,9 @@ export default ({ mode, command }) => {
           // lmy
           // target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.101:8888',
-          // target: 'http://192.168.10.75:8777',
+          target: 'http://192.168.10.75:8777',
           // tjj
-<<<<<<< HEAD
           // target: 'http://192.168.10.25:13000',
-=======
-          target: 'http://192.168.10.25:13000',
->>>>>>> 1fe2aeedc042f5201a0822d0f3debfa60899e91a
           // sst
           // target: 'http://192.168.10.94:8888',
           // target: 'http://test.api.huitongys.com',