Fix merge conflicts

Author: mccheah

core/src/main/java/org/apache/spark/shuffle/sort/io/LocalDiskShuffleMapOutputWriter.java

@@ -97,8 +97,7 @@ public ShufflePartitionWriter getPartitionWriter(int reducePartitionId) throws I
   }
 
   @Override
-<<<<<<< HEAD
-  public void commitAllPartitions() throws IOException {
+  public long[] commitAllPartitions() throws IOException {
     // Check the position after transferTo loop to see if it is in the right position and raise a
     // exception if it is incorrect. The position will not be increased to the expected length
     // after calling transferTo in kernel version 2.6.32. This issue is described at
@@ -112,11 +111,6 @@ public void commitAllPartitions() throws IOException {
               "to unexpected behavior when using transferTo. You can set " +
               "spark.file.transferTo=false to disable this NIO feature.");
     }
-||||||| merged common ancestors
-  public void commitAllPartitions() throws IOException {
-=======
-  public long[] commitAllPartitions() throws IOException {
->>>>>>> origin/master
     cleanUp();
     File resolvedTmp = outputTempFile != null && outputTempFile.isFile() ? outputTempFile : null;
     blockResolver.writeIndexFileAndCommit(shuffleId, mapId, partitionLengths, resolvedTmp);