From 741dd5599986c7cb80208c1721967fc10042dc87 Mon Sep 17 00:00:00 2001
From: "nastasha.solomon" <nastasha.solomon@elastic.co>
Date: Mon, 16 Dec 2024 18:37:01 -0500
Subject: [PATCH] Fixes conflict

---
 docs/release-notes.asciidoc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/release-notes.asciidoc b/docs/release-notes.asciidoc
index 9ccfd6d962..ab7413ccaf 100644
--- a/docs/release-notes.asciidoc
+++ b/docs/release-notes.asciidoc
@@ -3,11 +3,8 @@
 
 This section summarizes the changes in each release.
 
-<<<<<<< HEAD
-=======
 * <<release-notes-8.17.0, {elastic-sec} version 8.17.0>>
 * <<release-notes-8.16.2, {elastic-sec} version 8.16.2>>
->>>>>>> b72efc18 (8.16.2 release notes (#6290))
 * <<release-notes-8.16.1, {elastic-sec} version 8.16.1>>
 * <<release-notes-8.16.0, {elastic-sec} version 8.16.0>>
 * <<release-notes-8.15.5, {elastic-sec} version 8.15.5>>