diff --git a/src/views/board/BoardView.vue b/src/views/board/BoardView.vue
index 898b39d..b9b8173 100644
--- a/src/views/board/BoardView.vue
+++ b/src/views/board/BoardView.vue
@@ -98,7 +98,6 @@
                         <BoardCommentList
                             :unknown="unknown"
                             :comments="comments"
-<<<<<<< HEAD
                             :isCommentPassword="isCommentPassword"
                             :isEditTextarea="isEditTextarea"
                             :passwordAlert="passwordAlert"
@@ -110,11 +109,6 @@
                             @commentDeleted="handleCommentDeleted"
                             @cancelEdit="handleCancelEdit"
                             @submitEdit="handleSubmitEdit"
-=======
-                            @updateReaction="handleCommentReaction"
-                            @submitComment="handleCommentReply"
-                            @commentDeleted="handleCommentDeleted"
->>>>>>> origin/main
                         />
                         <Pagination
                             v-if="pagination.pages"