diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdb42456d6b77d33723ab31b6b069ea02838bb26..0dea3f55015d8d98faab91d49a867d4d3a676994 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,10 +58,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [6.7.15-bb.4] - 2024-05-08
 
 ### Added
-<<<<<<< HEAD
-=======
 
->>>>>>> main
 - Added Istio Sidecar to restrict egress traffic to REGISTRY_ONLY
 - Added Istio ServiceEntry
 - Added istiohardened doc