diff --git a/src/qml/Page/RoomPage.qml b/src/qml/Page/RoomPage.qml
index 49919afb6..799571f03 100644
--- a/src/qml/Page/RoomPage.qml
+++ b/src/qml/Page/RoomPage.qml
@@ -167,94 +167,8 @@ Kirigami.Page {
     }
 
     function warning(title, message) {
-<<<<<<< HEAD
-        page.header.contentItem.text = `${title}<br />${message}`;
-        page.header.contentItem.type =  Kirigami.MessageType.Warning;
-        page.header.visible = true;
-    }
-
-    function showUserDetail(user) {
-        userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
-            room: currentRoom,
-            user: user,
-        }).open();
-    }
-
-    function goToLastMessage() {
-        currentRoom.markAllMessagesAsRead()
-        // scroll to the very end, i.e to messageListView.YEnd
-        messageListView.positionViewAtIndex(0, ListView.End)
-    }
-
-    function eventToIndex(eventID) {
-        const index = messageEventModel.eventIdToRow(eventID)
-        if (index === -1)
-            return -1
-        return sortedMessageEventModel.mapFromSource(messageEventModel.index(index, 0)).row
-    }
-
-    function firstVisibleIndex() {
-        let center = messageListView.x + messageListView.width / 2;
-        let index = -1
-        let i = 0
-        while (index === -1 && i < 100) {
-            index = messageListView.indexAt(center, messageListView.y + messageListView.contentY + i);
-            i++;
-        }
-        return index
-    }
-
-    function lastVisibleIndex() {
-        let center = messageListView.x + messageListView.width / 2;
-        let index = -1
-        let i = 0
-        while (index === -1 && i < 100) {
-            index = messageListView.indexAt(center, messageListView.y + messageListView.contentY + messageListView.height - i);
-            i++
-        }
-        return index;
-    }
-
-    // Mark all messages as read if all unread messages are visible to the user
-    function markReadIfVisible() {
-        let readMarkerRow = eventToIndex(currentRoom.readMarkerEventId)
-        if (readMarkerRow >= 0 && readMarkerRow < firstVisibleIndex() && messageListView.atYEnd) {
-            currentRoom.markAllMessagesAsRead()
-        }
-    }
-
-    /// Open message context dialog for file and videos
-    function openFileContext(event, file) {
-        const contextMenu = fileDelegateContextMenu.createObject(page, {
-            author: event.author,
-            message: event.plainText,
-            eventId: event.eventId,
-            source: event.source,
-            file: file,
-            mimeType: event.mimeType,
-            progressInfo: event.progressInfo,
-            plainMessage: event.plainText,
-        });
-        contextMenu.open();
-    }
-
-    /// Open context menu for normal message
-    function openMessageContext(event, selectedText, plainMessage) {
-        const contextMenu = messageDelegateContextMenu.createObject(page, {
-            selectedText: selectedText,
-            author: event.author,
-            message: event.display,
-            eventId: event.eventId,
-            formattedBody: event.formattedBody,
-            source: event.source,
-            eventType: event.delegateType,
-            plainMessage: plainMessage,
-        });
-        contextMenu.open();
-=======
         root.header.contentItem.text = `${title}<br />${message}`;
         root.header.contentItem.type =  Kirigami.MessageType.Warning;
         root.header.visible = true;
->>>>>>> 48e95ac6 (Refactor RoomPage into various component)
     }
 }