From a2a58c354ecd6a5dd5a6376d7f15c044eaf39b39 Mon Sep 17 00:00:00 2001
From: kevinyhzou <kevinyunhe8@gmail.com>
Date: Thu, 19 Sep 2024 18:13:34 +0800
Subject: [PATCH] solve conflict

---
 .../gluten/utils/clickhouse/ClickHouseTestSettings.scala  | 8 --------
 .../gluten/utils/clickhouse/ClickHouseTestSettings.scala  | 8 --------
 .../gluten/utils/clickhouse/ClickHouseTestSettings.scala  | 8 --------
 .../gluten/utils/clickhouse/ClickHouseTestSettings.scala  | 8 --------
 4 files changed, 32 deletions(-)

diff --git a/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
index 378aa5f3a01b..64fcaeea4578 100644
--- a/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
+++ b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -653,15 +653,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
     .exclude("cast from struct II")
     .exclude("cast from struct III")
   enableSuite[GlutenCollectionExpressionsSuite]
-<<<<<<< HEAD
-    .exclude("Array and Map Size")
-    .exclude("MapEntries")
-    .exclude("Map Concat")
-    .exclude("MapFromEntries")
-    .exclude("ArraysZip")
-=======
     .exclude("ArraysZip") // wait for https://github.com/ClickHouse/ClickHouse/pull/69576
->>>>>>> main
     .exclude("Sequence of numbers")
     .exclude("elementAt")
     .exclude("Shuffle")
diff --git a/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
index eec9c2700727..c260d3f8029b 100644
--- a/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
+++ b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -681,15 +681,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
     .exclude("cast from struct II")
     .exclude("cast from struct III")
   enableSuite[GlutenCollectionExpressionsSuite]
-<<<<<<< HEAD
-    .exclude("Array and Map Size")
-    .exclude("MapEntries")
-    .exclude("Map Concat")
-    .exclude("MapFromEntries")
-    .exclude("ArraysZip")
-=======
     .exclude("ArraysZip") // wait for https://github.com/ClickHouse/ClickHouse/pull/69576
->>>>>>> main
     .exclude("Sequence of numbers")
     .exclude("elementAt")
     .exclude("Shuffle")
diff --git a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
index df0a8f8bdbd2..76ca12b0ac0f 100644
--- a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
+++ b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -570,15 +570,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
     .exclude("SPARK-36924: Cast YearMonthIntervalType to IntegralType")
     .exclude("SPARK-36924: Cast IntegralType to YearMonthIntervalType")
   enableSuite[GlutenCollectionExpressionsSuite]
-<<<<<<< HEAD
-    .exclude("Array and Map Size")
-    .exclude("MapEntries")
-    .exclude("Map Concat")
-    .exclude("MapFromEntries")
-    .exclude("ArraysZip")
-=======
     .exclude("ArraysZip") // wait for https://github.com/ClickHouse/ClickHouse/pull/69576
->>>>>>> main
     .exclude("Sequence of numbers")
     .exclude("elementAt")
     .exclude("Shuffle")
diff --git a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
index f6f386142a9c..a3553935ae84 100644
--- a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
+++ b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -570,15 +570,7 @@ class ClickHouseTestSettings extends BackendTestSettings {
     .exclude("SPARK-36924: Cast YearMonthIntervalType to IntegralType")
     .exclude("SPARK-36924: Cast IntegralType to YearMonthIntervalType")
   enableSuite[GlutenCollectionExpressionsSuite]
-<<<<<<< HEAD
-    .exclude("Array and Map Size")
-    .exclude("MapEntries")
-    .exclude("Map Concat")
-    .exclude("MapFromEntries")
-    .exclude("ArraysZip")
-=======
     .exclude("ArraysZip") // wait for https://github.com/ClickHouse/ClickHouse/pull/69576
->>>>>>> main
     .exclude("Sequence of numbers")
     .exclude("elementAt")
     .exclude("Shuffle")