From 9515181f1c41a6e6c7fd1e3cc24f0868e4315062 Mon Sep 17 00:00:00 2001
From: Ryan Liang <jiallian@amazon.com>
Date: Wed, 10 May 2023 09:51:26 -0700
Subject: [PATCH] Fix the conflicts

Signed-off-by: Ryan Liang <jiallian@amazon.com>
---
 .../matcher/GetSettingsResponseContainsIndicesMatcher.java    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/integrationTest/java/org/opensearch/test/framework/matcher/GetSettingsResponseContainsIndicesMatcher.java b/src/integrationTest/java/org/opensearch/test/framework/matcher/GetSettingsResponseContainsIndicesMatcher.java
index 47f4820944..d88b65875e 100644
--- a/src/integrationTest/java/org/opensearch/test/framework/matcher/GetSettingsResponseContainsIndicesMatcher.java
+++ b/src/integrationTest/java/org/opensearch/test/framework/matcher/GetSettingsResponseContainsIndicesMatcher.java
@@ -38,11 +38,7 @@ protected boolean matchesSafely(GetSettingsResponse response, Description mismat
 			if (!indexToSettings.containsKey(index)) {
 				mismatchDescription
 						.appendText("Response contains settings of indices: ")
-<<<<<<< HEAD
 						.appendValue(indexToSettings.keySet().toArray());
-=======
-						.appendValue(indexToSettings.keySet());
->>>>>>> main
 				return false;
 			}
 		}