diff --git a/qml/pages/Profile.qml b/qml/pages/Profile.qml
index aaca520..c26c7ed 100644
--- a/qml/pages/Profile.qml
+++ b/qml/pages/Profile.qml
@@ -29,6 +29,7 @@ Page {
     property bool muting : false;
     property bool domain_blocking : false;
 
+
     WorkerScript {
         id: worker
         source: "../lib/Worker.js"
@@ -264,7 +265,6 @@ Page {
                         console.log(link)
                         console.log(JSON.stringify(test))
                         console.log(JSON.stringify(test.length))
-<<<<<<< HEAD
 
                         if (test.length === 5 && (test[3] === "tags" || test[3] === "tag") ) {
                             pageStack.pop(pageStack.find(function(page) {
@@ -285,28 +285,6 @@ Page {
                         }
                     }
 
-=======
-
-                        if (test.length === 5 && (test[3] === "tags" || test[3] === "tag") ) {
-                            pageStack.pop(pageStack.find(function(page) {
-                                var check = page.isFirstPage === true;
-                                if (check)
-                                    page.onLinkActivated(link)
-                                return check;
-                            }));
-                            send(link)
-
-                        } else if (test.length === 4 && test[3][0] === "@" ) {
-                            tlSearch.search = decodeURIComponent("@"+test[3].substring(1)+"@"+test[2])
-                            slideshow.positionViewAtIndex(4, ListView.SnapToItem)
-                            navigation.navigateTo('search')
-
-                        } else {
-                            Qt.openUrlExternally(link);
-                        }
-                    }
-
->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
                 }
                 Column {
                     spacing: Theme.paddingMedium