From c0705718f1ee39eca3c5684ae65f76abf9019ed9 Mon Sep 17 00:00:00 2001
From: Andres Rodriguez <andresrc@gmail.com>
Date: Thu, 16 Sep 2021 19:47:50 +0200
Subject: [PATCH] Fix wrong merge

---
 libbeat/docs/release.asciidoc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libbeat/docs/release.asciidoc b/libbeat/docs/release.asciidoc
index 0f90b5ca4fd..80858dd0a91 100644
--- a/libbeat/docs/release.asciidoc
+++ b/libbeat/docs/release.asciidoc
@@ -8,11 +8,9 @@ This section summarizes the changes in each release. Also read
 <<breaking-changes>> for more detail about changes that affect
 upgrade.
 
-<<<<<<< HEAD
+* <<release-notes-8.0.0-alpha2>>
 * <<release-notes-8.0.0-alpha1>>
-=======
 * <<release-notes-7.14.2>>
->>>>>>> 8afdddc333 (Forward port 7.14.2 changelog to 7.x (#27972))
 * <<release-notes-7.14.1>>
 * <<release-notes-7.14.0>>
 * <<release-notes-7.13.4>>