diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2043f476033f5436b0f6be67dad136651473a513..0b12c28bccdc75bafccaa11918cdaf31fc7788aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,6 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
-<<<<<<< CHANGELOG.md
 ## [5.5.1-bb.6] 2025-02-26
 ### Changed