diff --git a/apps/launcher/datafilespage.hpp b/apps/launcher/datafilespage.hpp
index 524382f2b..61a8ca06e 100644
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@@ -30,11 +30,7 @@ public slots:
     void masterSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
     void setCheckstate(QModelIndex index);
     void resizeRows();
-<<<<<<< HEAD
     void profileChanged(const QString &current, const QString &previous);
-=======
-    void profileChanged(const QString &profile);
->>>>>>> 766e3f6... Added combobox slot for changing the profile
 
 private:
     QTableWidget *mMastersWidget;