diff --git a/src/pages/MailPage.vue b/src/pages/MailPage.vue
index b748756..fa65940 100644
--- a/src/pages/MailPage.vue
+++ b/src/pages/MailPage.vue
@@ -200,7 +200,6 @@ const handleFolderCreated = (folder: CollectionObject) => mailStore.notify(`Fold
           <!-- Message list panel -->
           <div class="mail-list-panel">
             <MessageList
-<<<<<<< HEAD
               :messages="currentMessages"
               :selected-message="selectedMessage"
               :selected-message-ids="selectedMessageIds"
@@ -209,8 +208,6 @@ const handleFolderCreated = (folder: CollectionObject) => mailStore.notify(`Fold
               :has-selection="hasSelection"
               :all-current-messages-selected="allCurrentMessagesSelected"
               :selected-collection="selectedFolder"
-=======
->>>>>>> 749d922 (refactor: improve logic)
               :loading="loading"
               @open="handleMessageOpen"
               @toggle-selection="handleMessageSelectionToggle"