diff --git a/plugins/ChangeLogPlugin/ChangeLog.txt b/plugins/ChangeLogPlugin/ChangeLog.txt
index c989647fbb..3d6ffd77c9 100644
--- a/plugins/ChangeLogPlugin/ChangeLog.txt
+++ b/plugins/ChangeLogPlugin/ChangeLog.txt
@@ -68,7 +68,6 @@ A new, infill type that’s easily breakable, introduced specially for support.
 
 *Support Roofs
 A new sub-feature to reduce scars the support leaves on overhangs.
->>>>>>> 24c8773... Update changelog with corrections done after release
 
 *Support Towers
 Specialized support for tiny overhang areas.