diff --git a/fe/fe-core/src/test/java/com/starrocks/sql/plan/ReplayFromDumpTest.java b/fe/fe-core/src/test/java/com/starrocks/sql/plan/ReplayFromDumpTest.java
index 74b310da65bbcc..7ac67776512566 100644
--- a/fe/fe-core/src/test/java/com/starrocks/sql/plan/ReplayFromDumpTest.java
+++ b/fe/fe-core/src/test/java/com/starrocks/sql/plan/ReplayFromDumpTest.java
@@ -558,8 +558,12 @@ public void testGroupByDistinctColumnSkewHint() throws Exception {
         Assert.assertTrue(replayPair.second, replayPair.second.contains("  9:Project\n" +
                 "  |  <slot 39> : 39: year\n" +
                 "  |  <slot 42> : 42: case\n" +
+<<<<<<< HEAD
                 "  |  <slot 45> : CAST(murmur_hash3_32(CAST(42: case AS VARCHAR)) % 512 AS SMALLINT)" +
                 ""));
+=======
+                "  |  <slot 45> : CAST(murmur_hash3_32(CAST(42: case AS VARCHAR)) % 512 AS SMALLINT)"));
+>>>>>>> 47cf36c7a7 ([UT] Make ReplayFromDumpTest.testGroupByDistinctColumnSkewHint stable (#52483))
     }
 
     @Test
@@ -570,8 +574,12 @@ public void testGroupByDistinctColumnOptimization() throws Exception {
         Assert.assertTrue(replayPair.second, replayPair.second.contains("  9:Project\n" +
                 "  |  <slot 39> : 39: year\n" +
                 "  |  <slot 42> : 42: case\n" +
+<<<<<<< HEAD
                 "  |  <slot 45> : CAST(murmur_hash3_32(CAST(42: case AS VARCHAR)) % 512 AS SMALLINT)" +
                 ""));
+=======
+                "  |  <slot 45> : CAST(murmur_hash3_32(CAST(42: case AS VARCHAR)) % 512 AS SMALLINT)"));
+>>>>>>> 47cf36c7a7 ([UT] Make ReplayFromDumpTest.testGroupByDistinctColumnSkewHint stable (#52483))
     }
 
     @Test