diff --git a/server/src/test/java/org/opensearch/common/regex/RegexTests.java b/server/src/test/java/org/opensearch/common/regex/RegexTests.java
index 22ba1432850ea..b94bb16cbc4b2 100644
--- a/server/src/test/java/org/opensearch/common/regex/RegexTests.java
+++ b/server/src/test/java/org/opensearch/common/regex/RegexTests.java
@@ -98,10 +98,7 @@ public void testDoubleWildcardMatch() {
         assertTrue(Regex.simpleMatch("fff*******ddd", "FffAbcdDd", true));
         assertFalse(Regex.simpleMatch("fff*******ddd", "FffAbcdDd", false));
         assertFalse(Regex.simpleMatch("fff******ddd", "fffabcdd"));
-// <<<<<<< HEAD
         assertFalse(Regex.simpleMatch("fff*******ddd", "FffAbcdDd", false));
-// =======
-// >>>>>>> origin/1.3
         assertTrue(Regex.simpleMatch("abCDefGH******ddd", "abCDefGHddd", false));
         assertTrue(Regex.simpleMatch("******", "a"));
         assertTrue(Regex.simpleMatch("***WILDcard***", "aaaaaaaaWILDcardZZZZZZ", false));