From 57b3a48c20fe67a45788e56d8c2c786af0087139 Mon Sep 17 00:00:00 2001
From: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
Date: Thu, 21 Dec 2023 17:34:54 -0500
Subject: [PATCH] Update search-telemetry.md (#5956)

Signed-off-by: kolchfa-aws <105444904+kolchfa-aws@users.noreply.github.com>
---
 _dashboards/search-telemetry.md | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/_dashboards/search-telemetry.md b/_dashboards/search-telemetry.md
index 6cf6d73300..b6f8e779da 100644
--- a/_dashboards/search-telemetry.md
+++ b/_dashboards/search-telemetry.md
@@ -1,15 +1,9 @@
 ---
 layout: default
-<<<<<<< HEAD
-title: Search telemetry
-nav_order: 30
-=======
 title: Managing search telemetry settings
 nav_order: 100
->>>>>>> 7ba0d6d1 (Updates title (#2762))
 ---
 
-
 # Managing search telemetry settings
 
 You can use search telemetry to analyze search request performance by success or failure in OpenSearch Dashboards. OpenSearch stores telemetry data in the `.kibana_1` index.
@@ -46,4 +40,4 @@ OpenSearch Dashboards YAML value  | Search telemetry status: on or off
 # Set the value of this setting to false to suppress 
 # search usage telemetry to reduce the load of the OpenSearch cluster.
  data.search.usageTelemetry.enabled: true
-```
\ No newline at end of file
+```