diff --git a/src/views/layout/components/main/planes/index.vue b/src/views/layout/components/main/planes/index.vue
index 6337654..92b16ec 100644
--- a/src/views/layout/components/main/planes/index.vue
+++ b/src/views/layout/components/main/planes/index.vue
@@ -2,15 +2,9 @@
   <div class="h-100">
     <map-box ref="mapbox" :key="mapBoxKey">
       <template #content>
-<<<<<<< HEAD
-        <!-- <PlaneStatus :plane="plane" /> -->
-        <As style="position:absolute;" />
-        <!-- <ControllerTabs :plane="plane" @mapXOffset="mapXOffset" @makeRoute="makeRoute" @clearRoute="clearRoute" /> -->
-=======
         <BatteryStatus :plane="plane" />
         <PlaneStatus :plane="plane" />
         <ControllerTabs :plane="plane" @mapXOffset="mapXOffset" @makeRoute="makeRoute" @clearRoute="clearRoute" />
->>>>>>> c4f06be21d8dfc2a3299a8751200d08811bb8d9a
       </template>
     </map-box>
   </div>