diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 56befec09..21f01524b 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -359,11 +359,7 @@ void Tokenizer::createTokens(std::istream &code)
                 {
                     if (lineNumbers.empty() || fileIndexes.empty())
                     {
-<<<<<<< HEAD
                         cppcheckError(0);
-=======
-                        std::cerr << "####### Preprocessor bug! #######\n";
->>>>>>> asd
                         deallocateTokens();
                         return;
                     }