diff --git a/app/pages/(features)/tools-equipment-src/equipment/index.vue b/app/pages/(features)/tools-equipment-src/equipment/index.vue
index 7f774f20..92061d83 100644
--- a/app/pages/(features)/tools-equipment-src/equipment/index.vue
+++ b/app/pages/(features)/tools-equipment-src/equipment/index.vue
@@ -33,11 +33,7 @@ const canRead = true // hasReadAccess(roleAccess)
 <template>
   <div>
     <div v-if="canRead">
-<<<<<<< HEAD
       <ContentEquipmentList />
-=======
-      <ContentMaterialList />
->>>>>>> 266d5f740b15942ca7b8845c00573640fdc9a3b2
     </div>
     <Error v-else :status-code="403" />
   </div>
diff --git a/app/pages/(features)/tools-equipment-src/tools/index.vue b/app/pages/(features)/tools-equipment-src/tools/index.vue
index 7800e0c3..5301e65a 100644
--- a/app/pages/(features)/tools-equipment-src/tools/index.vue
+++ b/app/pages/(features)/tools-equipment-src/tools/index.vue
@@ -33,11 +33,7 @@ const canRead = true // hasReadAccess(roleAccess)
 <template>
   <div>
     <div v-if="canRead">
-<<<<<<< HEAD:app/pages/(features)/tools-equipment-src/tools/index.vue
       <ContentToolsList />
-=======
-      <ContentDeviceList />
->>>>>>> 266d5f740b15942ca7b8845c00573640fdc9a3b2:app/pages/(features)/tools-equipment-src/device/index.vue
     </div>
     <Error v-else :status-code="403" />
   </div>