diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 315d9830b7e..5daa81d68bd 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -3,9 +3,15 @@
 :issue: https://github.com/elastic/beats/issues/
 :pull: https://github.com/elastic/beats/pull/
 
+<<<<<<< HEAD
 [[release-notes-8.16.1]]
 === Beats version 8.16.1
 https://github.com/elastic/beats/compare/v8.16.0\...v8.16.1[View commits]
+=======
+[[release-notes-8.15.5]]
+=== Beats version 8.15.5
+https://github.com/elastic/beats/compare/v8.15.4\...v8.15.5[View commits]
+>>>>>>> b215a4a367 (docs: Prepare Changelog for 8.15.5 (#41771))
 
 ==== Breaking changes
 
@@ -15,6 +21,7 @@ https://github.com/elastic/beats/compare/v8.16.0\...v8.16.1[View commits]
 
 ==== Bugfixes
 
+<<<<<<< HEAD
 *Filebeat*
 
 - Fix AWS region in aws-s3 input S3 polling mode.  {pull}41572[41572]
@@ -131,6 +138,15 @@ filebeat.inputs:
 - Add AWS Cloudwatch capability to retrieve tags from AWS/ApiGateway resources. {pull}40755[40755]
 - Add new metrics for the vSphere Virtualmachine metricset. {pull}40485[40485]
 - Add `metrics_count` to Prometheus module if `metrics_count: true` is set. {pull}40411[40411]
+=======
+*Affecting all Beats*
+
+- Fix metrics not being ingested, due to "Limit of total fields [10000] has been exceeded while adding new fields [...]". The total fields limit has been increased to 12500. No significant performance impact on Elasticsearch is anticipated. {pull}41640[41640]
+
+*Filebeat*
+
+- Fix AWS region in `aws-s3` input S3 polling mode.  {pull}41572[41572]
+>>>>>>> b215a4a367 (docs: Prepare Changelog for 8.15.5 (#41771))
 
 
 [[release-notes-8.15.4]]
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 0c2832ddec0..c248a0155d6 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -10,7 +10,6 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 
 *Affecting all Beats*
 
-- Fix metrics not being ingested, due to "Limit of total fields [10000] has been exceeded while adding new fields [...]". The total fields limit has been increased to 12500. No significant performance impact on Elasticsearch is anticipated. {pull}41640[41640]
 
 *Auditbeat*
 
@@ -112,6 +111,9 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 - Fix the "No such input type exist: 'salesforce'" error on the Windows/AIX platform. {pull}41664[41664]
 - Add support for Access Points in the `aws-s3` input. {pull}41495[41495]
 - Improve S3 object size metric calculation to support situations where Content-Length is not available. {pull}41755[41755]
+- Log bad handshake details when websocket connection fails {pull}41300[41300]
+- Fix double encoding of client_secret in the Entity Analytics input's Azure Active Directory provider {pull}41393[41393]
+- The azure-eventhub input now correctly reports its status to the Elastic Agent on fatal errors {pull}41469[41469]
 
 *Heartbeat*
 
diff --git a/libbeat/docs/release.asciidoc b/libbeat/docs/release.asciidoc
index 3d8c7762eae..2b18e51a3d0 100644
--- a/libbeat/docs/release.asciidoc
+++ b/libbeat/docs/release.asciidoc
@@ -8,8 +8,12 @@ This section summarizes the changes in each release. Also read
 <<breaking-changes>> for more detail about changes that affect
 upgrade.
 
+<<<<<<< HEAD
 * <<release-notes-8.16.1>>
 * <<release-notes-8.16.0>>
+=======
+* <<release-notes-8.15.5>>
+>>>>>>> b215a4a367 (docs: Prepare Changelog for 8.15.5 (#41771))
 * <<release-notes-8.15.4>>
 * <<release-notes-8.15.3>>
 * <<release-notes-8.15.2>>