diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index 4336ad84..d9448b2f 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -7,10 +7,6 @@ const config = {
 	// #endif
 	// #ifndef H5
 	host: 'http://91f.xyz:8080',
-<<<<<<< HEAD
-	// host: 'https://1a880cd5.r24.cpolar.top/',
-=======
->>>>>>> 409f137e8990b13381bdbe7efca7eec9a3cfc89e
 	// #endif
 	// 支付方式配置
 	payType: {
diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index c88a2788..fc5535df 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -4,10 +4,6 @@ import {
 import uni from '@dcloudio/vite-plugin-uni';
 
 let target = 'http://91f.xyz:8080'
-<<<<<<< HEAD
-// let target = 'https://1a880cd5.r24.cpolar.top/'
-=======
->>>>>>> 409f137e8990b13381bdbe7efca7eec9a3cfc89e
 
 export default defineConfig({
 	plugins: [uni()],