diff --git a/docs/release-notes/8.14.asciidoc b/docs/release-notes/8.14.asciidoc
index 69199d29f4..5e51058ae8 100644
--- a/docs/release-notes/8.14.asciidoc
+++ b/docs/release-notes/8.14.asciidoc
@@ -2,8 +2,6 @@
 == 8.14
 
 [discrete]
-<<<<<<< HEAD
-=======
 [[release-notes-8.14.3]]
 === 8.14.3