diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8d0a3e..2204566 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,7 +27,6 @@ Find changes for the upcoming release in the project's [changelog.d](https://git
 ## 1.18.1 (2024-07-11)
 
 ### Changed
->>>>>>> 9fb786e (Fix scriv settings, scriv collect previous fragment)
 
 - Change Postgres to v15 and base image to fedora (centos endoflife)