diff --git a/react-ui/config/proxy.ts b/react-ui/config/proxy.ts
index a742933c..20769b3c 100644
--- a/react-ui/config/proxy.ts
+++ b/react-ui/config/proxy.ts
@@ -23,11 +23,7 @@ export default {
       target: 'http://172.20.32.197:31213', // 开发环境
       // target: 'http://172.20.32.235:31213', // 测试环境
       // target: 'http://172.20.32.44:8082',
-<<<<<<< HEAD
       // target: 'http://172.20.32.164:8082',
-=======
-      target: 'http://172.20.32.164:8082',
->>>>>>> dev-zw
       // 配置了这个可以从 http 代理到 https
       // 依赖 origin 的功能可能需要这个，比如 cookie
       changeOrigin: true,
diff --git a/react-ui/src/utils/sessionStorage.ts b/react-ui/src/utils/sessionStorage.ts
index 8b981916..58d26682 100644
--- a/react-ui/src/utils/sessionStorage.ts
+++ b/react-ui/src/utils/sessionStorage.ts
@@ -13,13 +13,10 @@ export default class SessionStorage {
   static readonly aimUrlKey = 'aim-url';
   /** tensorBoard url */
   static readonly tensorBoardUrlKey = 'tensor-board-url';
-<<<<<<< HEAD
   /** 登录之前的地址 */
   static readonly redirectUrl = 'redirect-url';
-=======
   // /** 云际系统 Token */
   // static readonly jccTokenKey = 'jcc-token';
->>>>>>> dev-zw
 
   /**
    * 获取 SessionStorage 值