diff --git a/changelogs/8.14.asciidoc b/changelogs/8.14.asciidoc
index 3fd938287ff..018326e1368 100644
--- a/changelogs/8.14.asciidoc
+++ b/changelogs/8.14.asciidoc
@@ -13,6 +13,12 @@ https://github.com/elastic/apm-server/compare/v8.14.1\...v8.14.2[View commits]
 
 No significant changes.
 
+<<<<<<< HEAD
+=======
+=== Added
+- Optimize memory usage and disk read IO for Tail Based Sampling {pull}13464[13464]
+
+>>>>>>> b99e36bde (8.14.2: add missing changelog entry (#13555))
 [float]
 [[apm-release-notes-8.14.1]]
 === APM version 8.14.1