diff --git a/fapp/ciyon_ap/defpages.json b/fapp/ciyon_ap/defpages.json
index 681e36e..3cdecfe 100644
--- a/fapp/ciyon_ap/defpages.json
+++ b/fapp/ciyon_ap/defpages.json
@@ -18,17 +18,12 @@
 				"pagePath": "pages/main/index"
 			},
 			{
-<<<<<<< HEAD
 				"pagePath": "pages/main/message"
 			},
 			{
 				"pagePath": "pages/main/me"
 			}
 
-=======
-				"pagePath": "pages/main/me"
-			}
->>>>>>> 2b53f1cf47e1dea64c20044ab860c92bfd595c2a
 		]
 	},
 	"preloadRule": {
diff --git a/fapp/ciyon_ap/pages.json b/fapp/ciyon_ap/pages.json
index 2e1a574..932369c 100644
--- a/fapp/ciyon_ap/pages.json
+++ b/fapp/ciyon_ap/pages.json
@@ -7,22 +7,13 @@
       }
     },
     {
-<<<<<<< HEAD
       "path": "pages/main/me",
-=======
-      "path": "pages/main/notify",
->>>>>>> 2b53f1cf47e1dea64c20044ab860c92bfd595c2a
       "style": {
         "enablePullDownRefresh": true
       }
     },
-<<<<<<< HEAD
      {
       "path": "pages/main/message",
-=======
-    {
-      "path": "pages/main/me",
->>>>>>> 2b53f1cf47e1dea64c20044ab860c92bfd595c2a
       "style": {
         "enablePullDownRefresh": true
       }
@@ -67,11 +58,7 @@
         "pagePath": "pages/main/index"
       },
       {
-<<<<<<< HEAD
         "pagePath": "pages/main/message"
-=======
-        "pagePath": "pages/main/notify"
->>>>>>> 2b53f1cf47e1dea64c20044ab860c92bfd595c2a
       },
       {
         "pagePath": "pages/main/me"
@@ -425,7 +412,6 @@
       ]
     },
 	{
-<<<<<<< HEAD
 	      "root": "pages/lab",
 	      "pages": [
 	        {
@@ -438,17 +424,5 @@
 			}
 	    ]
 	}
-=======
-      "root": "pages/lab",
-      "pages": [
-        {
-          "path": "userlist",
-          "style": {
-            "enablePullDownRefresh": true
-          }
-        }
-      ]
-    }
->>>>>>> 2b53f1cf47e1dea64c20044ab860c92bfd595c2a
   ]
 }
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/main/index.vue b/fapp/ciyon_ap/pages/main/index.vue
index 32d7328..1063392 100644
--- a/fapp/ciyon_ap/pages/main/index.vue
+++ b/fapp/ciyon_ap/pages/main/index.vue
@@ -22,11 +22,7 @@
 					<view class="icon" :style="{backgroundImage:svg2bg(svg.cqd)}"></view>
 					<view class="name">游客页面</view>
 				</view>
-<<<<<<< HEAD
 				<view class="grid" @tap="gourl" data-url="$/pages/lab/user_list">
-=======
-				<view class="grid" @tap="gourl" data-url="$/pages/lab/userlist">
->>>>>>> 2b53f1cf47e1dea64c20044ab860c92bfd595c2a
 					<view class="icon" :style="{backgroundImage:svg2bg(svg.cjf)}"></view>
 					<view class="name">成员管理</view>
 				</view>
@@ -59,10 +55,6 @@
 			}
 		},
 		onLoad() {
-<<<<<<< HEAD
-=======
-				console.log('onload');
->>>>>>> 2b53f1cf47e1dea64c20044ab860c92bfd595c2a
 			if (this.opn.u) {
 				uni.navigateTo({
 					url: decodeURIComponent(this.opn.u)
@@ -84,10 +76,6 @@
 		onShow() {
 			if (this._meid === this.me.id)
 				return;
-<<<<<<< HEAD
-=======
-				console.log('onshow 12');
->>>>>>> 2b53f1cf47e1dea64c20044ab860c92bfd595c2a
 			this._meid = this.me.id;
 			this.pageno = 0;
 			this.init.members = [];
diff --git a/fapp/ciyon_ap/util/lang/zh-Hans.json b/fapp/ciyon_ap/util/lang/zh-Hans.json
index 78ed86b..af708f0 100644
--- a/fapp/ciyon_ap/util/lang/zh-Hans.json
+++ b/fapp/ciyon_ap/util/lang/zh-Hans.json
@@ -19,13 +19,8 @@
 	"多语言切换": "多语言切换",
 	
 	"tabbar.index": "广场",
-<<<<<<< HEAD
 	"tabbar.me": "我的",
 	"tabbar.message":"消息中心",
-=======
-	"tabbar.notify": "消息",
-	"tabbar.me": "我的",
->>>>>>> 2b53f1cf47e1dea64c20044ab860c92bfd595c2a
 	"login.xieyi": "/pages/main/paper?id=3",
 	"login.tablogin": "登录",
 	"login.tabreg": "注册",
diff --git a/fapp/ciyon_ap/vite.config.js b/fapp/ciyon_ap/vite.config.js
index 5d064da..9c20def 100644
--- a/fapp/ciyon_ap/vite.config.js
+++ b/fapp/ciyon_ap/vite.config.js
@@ -38,19 +38,5 @@ export default defineConfig({
 			scss: {},
 		},
 	},
-<<<<<<< HEAD
 	server: {},
-=======
-	server: {
-		// 仅新增这一段代理配置，其他保持不变
-		port: 5173, // 保留你原本的5173端口
-		proxy: {
-			'/ambap': { // 转发/ambap开头的请求到Nginx
-				target: 'https://labsci.local.ciy.cn', // 你的Nginx域名
-				changeOrigin: true, // 允许跨域
-				secure: false // 忽略HTTPS证书校验（本地开发必加）
-			}
-		}
-	},
->>>>>>> 2b53f1cf47e1dea64c20044ab860c92bfd595c2a
 })
\ No newline at end of file
diff --git a/web/ambap/common.php b/web/ambap/common.php
index 5b46912..131141d 100644
--- a/web/ambap/common.php
+++ b/web/ambap/common.php
@@ -42,11 +42,7 @@ function verifyuser($post = null) {
     $auth = json_decode(encrypt($ciyauth, 'D', $_token['salt']), true);
     if ($auth == null)
         return null;
-<<<<<<< HEAD
     $csql = new \ciy\sql('ap_user'); //弃用redis集群
-=======
-    $csql = new \ciy\sql('lab_user'); //弃用redis集群
->>>>>>> 2b53f1cf47e1dea64c20044ab860c92bfd595c2a
     $csql->where('id', $auth['id']);
     $userrow = $db->getone($csql);
     if (!is_array($userrow))
@@ -57,7 +53,6 @@ function verifyuser($post = null) {
         return null;
     if ($userrow['exptimes'] < time() - $_token['expsec'])
         return null;
-<<<<<<< HEAD
     if ($post && $userrow['upid'] == 0) {
         $upid = $post->getint('upid');
         if ($upid > 0) {
@@ -68,18 +63,12 @@ function verifyuser($post = null) {
             $db->update($csql, $updata);
         }
     }
-=======
->>>>>>> 2b53f1cf47e1dea64c20044ab860c92bfd595c2a
     if ($userrow['exptimes'] > time())
         return $userrow;
     $exp = time() + $_token['swapsec'];
     $sid = randstr(10);
     $auth['_s'] = $sid;
-<<<<<<< HEAD
     if ($db->execute('update ap_user set exptimes=?,sid=? where id=?', array($exp, $sid, $auth['id'])) === false)
-=======
-    if ($db->execute('update lab_user set exptimes=?,sid=? where id=?', array($exp, $sid, $auth['id'])) === false)
->>>>>>> 2b53f1cf47e1dea64c20044ab860c92bfd595c2a
         return null;
     $authstr = json_encode($auth, JSON_PARTIAL_OUTPUT_ON_ERROR);
     $enauth = encrypt($authstr, 'E', $_token['salt']);