diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
index fe375bc67e3..40043a794ed 100644
--- a/changelogs/head.asciidoc
+++ b/changelogs/head.asciidoc
@@ -11,5 +11,3 @@ https://github.com/elastic/apm-server/compare/7.5\...master[View commits]
 - Try to extract IP address from headers before using socket remote_address for `client.ip` and `source.ip` {pull}2935[2935].
 - Only use extracted hostname when valid IP for enriching events {pull}2935[2935].
 - Added experimental support for continuous profiling of the server {pull}2839[2839]
-
->>>>>>> beater: add profiling endpoint