From df7acae6f38654850b70e07eab1833ea20e9e10d Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Tue, 11 Jun 2024 08:04:40 -0600
Subject: [PATCH] remove centos profile and fix merge conflict

---
 pom.xml                                                    | 7 -------
 .../comet/execution/shuffle/CometShuffleExchangeExec.scala | 5 -----
 2 files changed, 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1cce9fde1..1c0961059 100644
--- a/pom.xml
+++ b/pom.xml
@@ -447,13 +447,6 @@ under the License.
       </properties>
     </profile>
 
-    <profile>
-      <id>release-centos7</id>
-      <properties>
-        <jni.dir>${project.basedir}/../core/target/x86_64-unknown-linux-gnu/release</jni.dir>
-      </properties>
-    </profile>
-
     <profile>
       <id>Win-x86</id>
       <activation>
diff --git a/spark/src/main/scala/org/apache/spark/sql/comet/execution/shuffle/CometShuffleExchangeExec.scala b/spark/src/main/scala/org/apache/spark/sql/comet/execution/shuffle/CometShuffleExchangeExec.scala
index 93ab2811e..b94717cdf 100644
--- a/spark/src/main/scala/org/apache/spark/sql/comet/execution/shuffle/CometShuffleExchangeExec.scala
+++ b/spark/src/main/scala/org/apache/spark/sql/comet/execution/shuffle/CometShuffleExchangeExec.scala
@@ -391,12 +391,7 @@ object CometShuffleExchangeExec extends ShimCometShuffleExchangeExec {
           val pageSize = SparkEnv.get.memoryManager.pageSizeBytes
 
           val sorter = UnsafeExternalRowSorter.createWithRecordComparator(
-<<<<<<< HEAD
-            //StructType.fromAttributes(outputAttributes),
             StructType(outputAttributes.map(a => StructField(a.name, a.dataType, a.nullable, a.metadata))),
-=======
-            fromAttributes(outputAttributes),
->>>>>>> apache/main
             recordComparatorSupplier,
             prefixComparator,
             prefixComputer,