diff --git a/src/AnalyzeView/ULogParser.cc b/src/AnalyzeView/ULogParser.cc
index ebe76dd3b7efc87f3f6b5869e244e8f89f43c6e1..d6b7f365eefee50535fe47c5b8938ee920c77cc4 100644
--- a/src/AnalyzeView/ULogParser.cc
+++ b/src/AnalyzeView/ULogParser.cc
@@ -177,11 +177,7 @@ bool ULogParser::getTagsFromLog(QByteArray& log, QList<GeoTagWorker::cameraFeedb
     }
 
     if (cameraFeedback.count() == 0) {
-<<<<<<< HEAD
-        qWarning() << "Could not detect camera_capture packets in ULog";
-=======
         errorMessage = tr("Could not detect camera_capture packets in ULog");
->>>>>>> b4f4085c6733b934358b00389d734600eab87bf7
         return false;
     }