diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 2d3ef2e8..b88cabc5 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -11,11 +11,7 @@
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
-<<<<<<< HEAD
-          @click="tabClick(index, item.title)"
-=======
           @click="tabClick(index, itemContent, item)"
->>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
           :class="
             clickList[index].content.indexOf(itemContent.labelName) != -1 ||
             clickList[index].content.indexOf(itemContent) != -1