diff --git a/sheep/components/s-menu-button/s-menu-button.vue b/sheep/components/s-menu-button/s-menu-button.vue
index e7f4e5c..cc7c104 100644
--- a/sheep/components/s-menu-button/s-menu-button.vue
+++ b/sheep/components/s-menu-button/s-menu-button.vue
@@ -53,17 +53,11 @@
 		</view> -->
 		<view class="newList">
 			<view class="new_menu" v-for="(arr, index) in menuList" :key="index">
-<<<<<<< Updated upstream
-				<view v-for="(item, index) in arr" :key="index" class="new_items"
-					:style="[{ width: `${100 * (1 / data.column)}%`}]" @tap="sheep.$router.go(item.url)">
-					<view class="menu-box ss-flex ss-flex-col ss-col-center ss-row-center">
-=======
 				<view v-for="(item, index) in arr" :key="index"
 					class="new_items"
 					:style="[{ width: `${100 * (1 / data.column)}%`}]">
 					<view class="menu-box ss-flex ss-flex-col ss-col-center ss-row-center"
 					@tap="sheep.$router.go(item.url)" v-if="item.title !== '平台客服' || (item.title === '平台客服' && userInfo.idKefu)">
->>>>>>> Stashed changes
 						<view v-if="item.badge.show" class="tag-box">
 							{{ item.badge.text }}
 						</view>
@@ -408,4 +402,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>