diff --git a/wuye-manager-uniapp/pages/index/index.vue b/wuye-manager-uniapp/pages/index/index.vue
index 58d1d5e..d9cc442 100644
--- a/wuye-manager-uniapp/pages/index/index.vue
+++ b/wuye-manager-uniapp/pages/index/index.vue
@@ -75,7 +75,6 @@
       <view class="statistics-wrap">
         <view class="statistics-item" @click="goToInspectionRecord">
           <text class="num">25</text>
-          <<<<<<< HEAD
           <text class="label">全部巡检</text>
         </view>
         <view class="statistics-item" @click="goToDaysInspection">
@@ -85,17 +84,6 @@
         <view class="statistics-item">
           <text class="num">25</text>
           <text class="label">已巡检</text>
-          =======
-          <text class="label">巡检点</text>
-        </view>
-        <view class="statistics-item" @click="goToDaysInspection">
-          <text class="num">5</text>
-          <text class="label">巡检点</text>
-        </view>
-        <view class="statistics-item">
-          <text class="num">25</text>
-          <text class="label">巡检点</text>
-          >>>>>>> ac8b4c380134ed183aa6f67c4ed3497e07b82b51
         </view>
       </view>
     </view>