diff --git a/src/components/partials/Comments.vue b/src/components/partials/Comments.vue
index 854dedcdb544c5837e7e92ae67f56d7d68a9ea82..e42103c2496032c10bbe8640ec16248c6f5be9d3 100644
--- a/src/components/partials/Comments.vue
+++ b/src/components/partials/Comments.vue
@@ -1,10 +1,6 @@
 <template>
-<<<<<<< HEAD
   <div id="placeholder">
     <h4 class="font-weight-bold">Komentar ({{rows}})</h4>
-=======
-  <div id="comments-placeholder">
->>>>>>> 8b073dd0b310f4ac1bcf4d8a7bdf1fc0952755b4
     <div id="comments-container">
       <b-card
         bg-variant="light"