diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9593490bdc..edd093030a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## HEAD
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 ### Fix flaky submission failures
 * #1084: CT flaky submission failures