diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65223b8bc3..0332e4a79e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,6 @@
 
 - Fix: add serviceaccount name in kustomize deployment (#1689) @jmthvt
 - Updates Oracle OCI SDK to latest (#1687) @ericrrath
-<<<<<<< HEAD
 - UltraDNS Provider (#1635) @kbhandari
 - Update apiVersions in docs (#1690) @ddgenome
 - use the github actions build status badge (#1702) @tariq1890