diff --git a/vue.config.js b/vue.config.js
index a79a8d1..a0644da 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -70,12 +70,9 @@ module.exports = {
 		proxy: {
 			'/api': {
 				// target: 'https://www.tmrjournals.cn',
-<<<<<<< HEAD
 				// target: 'http://www.tougao.com/public/index.php/',
-=======
 				// target: 'http://www.tougao.com/',
 				// target: 'http://192.168.110.110/tougao/public/index.php/',
->>>>>>> 9ec473bd42161f0b4a7396280e5701b21527e486
 				target: 'https://submission.tmrjournals.com/',//正式
 				changeOrigin: true,
 				pathRewrite: {