diff --git a/src/tile.cpp b/src/tile.cpp
index 03114324e..d2b88a79c 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -1590,7 +1590,6 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 			}
 		}
 		/*
-<<<<<<< HEAD
 			[colorize:color
 			Overlays image with given color
 			color = color as ColorString