diff --git a/src/content/content.cpp b/src/content/content.cpp
index c6e3c148f..6e3a94a69 100644
--- a/src/content/content.cpp
+++ b/src/content/content.cpp
@@ -71,7 +71,6 @@ Content &Content::operator= (Content &&src) {
 	return *this;
 }
 
-<<<<<<< HEAD
 bool Content::operator==(const Content& content) const {
 	L_D();
 	return d->contentType == content.getContentType() && d->body == content.getBody() && d->contentDisposition == content.getContentDisposition();