diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index a8d2ae4cf..3f20e7bc5 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -292,4 +292,7 @@ void MainWindow::ShowErrors(bool checked)
 {
     mResults.ShowResults(SHOW_ERRORS, checked);
 }
+<<<<<<< HEAD:gui/mainwindow.cpp
 
+=======
+>>>>>>> gui:gui/mainwindow.cpp
diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
index 559fb1b84..a32a48f87 100644
--- a/gui/resultstree.cpp
+++ b/gui/resultstree.cpp
@@ -77,7 +77,10 @@ void ResultsTree::AddErrorItem(const QString &file,
     }
 }
 
+<<<<<<< HEAD:gui/resultstree.cpp
 
+=======
+>>>>>>> gui:gui/resultstree.cpp
 ShowTypes ResultsTree::SeverityToShowType(const QString &severity)
 {
     if (severity == "all")