diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
index 9654419286..d484e9de48 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
@@ -262,7 +262,6 @@ List<OmVolumeArgs> listVolumes(String userName, String prefix,
   Table<byte[], byte[]> getS3Table();
 
   /**
-<<<<<<< HEAD
    * Returns the DB key name of a multipart upload key in OM metadata store.
    *
    * @param volume - volume name