diff --git a/src/views/main.vue b/src/views/main.vue
index 4fb7f34..942b99d 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -678,11 +678,7 @@ export default {
       let obj = JSON.parse(localStorage.getItem('LOGIN_DATA'))
       if (window.location.hostname == 'localhost') {
         // 测试环境，通过URL获取token
-<<<<<<< HEAD
-        window.location.href = 'http://localhost:3000/merchantManagement/homePage?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId
-=======
         window.location.href = 'http://localhost:3000/#/merchantManagement/homePage?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId;
->>>>>>> 89da42ca65630e40c2c5790cd453cfb543528a03
       } else {
         // 正式环境，通过缓存获取
         localStorage.setItem('daotian_to_admin_token', obj.token)