Fixes 8.14 pr

Author: nastasha-solomon

docs/release-notes.asciidoc

@@ -3,13 +3,6 @@
 
 This section summarizes the changes in each release.
 
-<<<<<<< HEAD
-=======
-* <<release-notes-8.15.3, {elastic-sec} version 8.15.3>>
-* <<release-notes-8.15.2, {elastic-sec} version 8.15.2>>
-* <<release-notes-8.15.1, {elastic-sec} version 8.15.1>>
-* <<release-notes-8.15.0, {elastic-sec} version 8.15.0>>
->>>>>>> 5ec4c649 (8.15.3 Release notes (#5905))
 * <<release-notes-8.14.3, {elastic-sec} version 8.14.3>>
 * <<release-notes-8.14.2, {elastic-sec} version 8.14.2>>
 * <<release-notes-8.14.2, {elastic-sec} version 8.14.2>>