diff --git a/vite.config.js b/vite.config.js
index 69cf894c..20e3dd86 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -12,11 +12,7 @@ export default ({ mode, command }) => {
       port: 2888,
       proxy: {
         '/api': {
-<<<<<<< HEAD
-          target: 'http://192.168.2.11:8889',
-=======
           target: 'http://192.168.2.29:13000',
->>>>>>> 859932a264850d576194e4a85decdd2c542ee4fb
           //target: 'http://test3.javablade.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),