From d03108776bfd08a307a1e3e77a6f40d48bdd4940 Mon Sep 17 00:00:00 2001
From: Mike Birnstiehl <114418652+mdbirnstiehl@users.noreply.github.com>
Date: Thu, 7 Nov 2024 08:24:51 -0600
Subject: [PATCH] Update docs/en/observability/index.asciidoc

---
 docs/en/observability/index.asciidoc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/en/observability/index.asciidoc b/docs/en/observability/index.asciidoc
index f426f45a87..1637982d5f 100644
--- a/docs/en/observability/index.asciidoc
+++ b/docs/en/observability/index.asciidoc
@@ -146,11 +146,8 @@ include::profiling-tag-data-query.asciidoc[leveloffset=+4]
 include::profiling-add-symbols.asciidoc[leveloffset=+4]
 include::profiling-use-a-proxy.asciidoc[leveloffset=+4]
 include::profiling-no-kernel-version-check.asciidoc[leveloffset=+4]
-<<<<<<< HEAD
-=======
 include::profiling-envs.asciidoc[leveloffset=+4]
 include::profiling-config-file.asciidoc[leveloffset=+4]
->>>>>>> e335f277 (profiling: add documentation for the config file and CLI arguments (#4398))
 
 include::profiling-upgrade.asciidoc[leveloffset=+3]