Fix CHANGELOG.md

Signed-off-by: Rémy Coutable <remy@rymai.me>

CHANGELOG.md

@@ -136,13 +136,8 @@ entry.
 - Bump Faraday and dependent OAuth2 gem version to support no_proxy variable.
 - Renders 404 if given project is not readable by the user on Todos dashboard.
 - Render CI statuses with warnings in orange.
-<<<<<<< HEAD
-- Add wells to admin dashboard overview to fix spacing problems.
-- Document the Delete Merged Branches functionality.
-=======
 - Document the Delete Merged Branches functionality.
 - Add wells to admin dashboard overview to fix spacing problems.
->>>>>>> ce-com/master
 - Removes hover style for nodes that are either links or buttons in the pipeline graph.
 - more visual contrast in pagination widget.
 - Deprecate Healthcheck Access Token in favor of IP whitelist.