diff --git a/pages.json b/pages.json
index 8df27b8..643815a 100644
--- a/pages.json
+++ b/pages.json
@@ -161,4 +161,4 @@
 	"easycom": {
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	}
-}
+}
\ No newline at end of file
diff --git a/pages/user/index.vue b/pages/user/index.vue
index aaf88b7..bc7f439 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -229,16 +229,13 @@
 			<view class="item" @click="$Router.push({name: 'couponsManagement'})">优惠券管理</view>
 			<view class="item" @click="$Router.push({name: 'instrumentBasics'})">店员管理</view>
 			<view class="item" @click="$Router.push({name: 'instrumentCustomer'})">成交客户</view>
-<<<<<<< HEAD
 			<view class="item" @click="$Router.push({name: 'instrumentBasics'})">店员管理</view>
+            <view class="item" @click="$Router.push({name: 'Personal'})">个人认证</view>
+            <view class="item" @click="$Router.push({name: 'companyApprove'})">企业认证</view>
+            <view class="item" @click="$Router.push({name: 'companyApprove', params: { form_type: 'put' }})">编辑企业认证</view>
+            <view class="item" @click="$Router.push({name: 'setting'})">设置中心</view>
 		</view> -->
-=======
-			<view class="item" @click="$Router.push({name: 'Personal'})">个人认证</view>
-			<view class="item" @click="$Router.push({name: 'companyApprove'})">企业认证</view>
-			<view class="item" @click="$Router.push({name: 'companyApprove', params: { form_type: 'put' }})">编辑企业认证</view>
-			<view class="item" @click="$Router.push({name: 'setting'})">设置中心</view>
 		</view>
->>>>>>> f02c1a75b3aa4cfdc5fdeec121af5e6a38f46834
 	</view>
 </template>