diff --git a/doc/release-notes.md b/doc/release-notes.md
index e073f6337..29877d6c5 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -447,8 +447,6 @@ Thanks to everyone who directly contributed to this release:
 - Gregory Sanders
 - Jonas Schnelli
 - Matt Corallo
-<<<<<<< HEAD
-=======
 - Matthew King
 - matthias
 - Max Keller