diff --git a/library/http_connection_handler.e b/library/http_connection_handler.e
index 2c024604..d23f178e 100644
--- a/library/http_connection_handler.e
+++ b/library/http_connection_handler.e
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 note
 	description: "Summary description for {HTTP_CONNECTION_HANDLER}."
 	author: ""