From 97427af2546da4db554828023eb522827203369c Mon Sep 17 00:00:00 2001
From: Melissa Vagi <vagimeli@amazon.com>
Date: Mon, 30 Oct 2023 18:05:43 -0600
Subject: [PATCH] Fix duplicative text and merge conflict data (#5447)

Signed-off-by: Melissa Vagi <vagimeli@amazon.com>
---
 _dashboards/management/multi-data-sources.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/_dashboards/management/multi-data-sources.md b/_dashboards/management/multi-data-sources.md
index a7603700..4454c616 100644
--- a/_dashboards/management/multi-data-sources.md
+++ b/_dashboards/management/multi-data-sources.md
@@ -108,12 +108,6 @@ To select a time range for the histogram, choose from the following options:
 ## Selecting multiple data sources in the Dev Tools console
 
 Selecting multiple data sources in the Dev Tools console allows you to work with a broader range of data and gain deeper insight into your code and applications. Watch the video to see it in action, and then try it out in the following steps.
-=======
-Selecting multiple data sources using the Dev Tools console gives you the flexibility to work with a broader range of data and gain deeper insight into your code and applications. Watch the following video to see it in action, and then try it out yourself. 
->>>>>>> 0e1f96cd (writing)
-=======
-Selecting multiple data sources by using the Dev Tools console gives you the flexibility to work with a broader range of data and gain deeper insight into your code and applications. Watch the following video to see it in action, and then try it out yourself. 
->>>>>>> 7f57cc3e (Update _dashboards/management/multi-data-sources.md)
 
 <img src="{{site.url}}{{site.baseurl}}/images/dashboards/multidata-dev-tools.gif" alt="Multiple data sources in Dev Tools demo">{: .img-fluid}