diff --git a/setup.cfg b/setup.cfg
index a04f1e1..162a4f3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,7 +4,6 @@ summary = Reference implementation of Redfish standard client.
 description-file =
     README.rst
 author = Redfish dev team
-<<<<<<< HEAD
 author-email = python-redfish@mondorescue.org
 home-page = https://github.com/uggla/python-redfish/tree/devel
 license = Apache-2