diff --git a/vite.config.ts b/vite.config.ts
index 4e37791..cfb2f12 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -47,13 +47,8 @@ export default defineConfig(({ mode, command }) => {
       open: false,
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
-<<<<<<< HEAD
         '/dev-api': {
           target: 'http://47.97.125.165:8905',
-=======
-        "/dev-api": {
-          target: "http://47.97.125.165:8904",
->>>>>>> 54ddd44bb13147760bd957847f6eff6fbe4abaee
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, ""),
         },