diff --git a/Makefile b/Makefile
index 81e7def4d..cc5936508 100644
--- a/Makefile
+++ b/Makefile
@@ -422,12 +422,8 @@ ldb: tools/ldb.o $(LIBOBJECTS)
 # ---------------------------------------------------------------------------
 # Jni stuff
 # ---------------------------------------------------------------------------
-<<<<<<< HEAD
-JNI_NATIVE_SOURCES = ./java/rocksjni/rocksjni.cc ./java/rocksjni/options.cc ./java/rocksjni/write_batch.cc ./java/rocksjni/statistics.cc
-=======
-JNI_NATIVE_SOURCES = ./java/rocksjni/*.cc
->>>>>>> 1a8abe72768b2b5cea800aa390c28e5ace6a552e
 
+JNI_NATIVE_SOURCES = ./java/rocksjni/*.cc
 JAVA_INCLUDE = -I/usr/lib/jvm/java-openjdk/include/ -I/usr/lib/jvm/java-openjdk/include/linux
 ROCKSDBJNILIB = ./java/librocksdbjni.so
 
diff --git a/java/Makefile b/java/Makefile
index 10327b999..c9e65808a 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-NATIVE_JAVA_CLASSES = org.rocksdb.RocksDB org.rocksdb.Options org.rocksdb.WriteBatch org.rocksdb.WriteBatchInternal org.rocksdb.WriteBatchTest org.rocksdb.WriteOptions org.rocksdb.Statistics
-=======
-NATIVE_JAVA_CLASSES = org.rocksdb.RocksDB org.rocksdb.Options org.rocksdb.WriteBatch org.rocksdb.WriteBatchInternal org.rocksdb.WriteBatchTest org.rocksdb.WriteOptions org.rocksdb.BackupableDB org.rocksdb.BackupableDBOptions
->>>>>>> 1a8abe72768b2b5cea800aa390c28e5ace6a552e
+NATIVE_JAVA_CLASSES = org.rocksdb.RocksDB org.rocksdb.Options org.rocksdb.WriteBatch org.rocksdb.WriteBatchInternal org.rocksdb.WriteBatchTest org.rocksdb.WriteOptions org.rocksdb.BackupableDB org.rocksdb.BackupableDBOptions org.rocksdb.Statistics
 NATIVE_INCLUDE = ./include
 ROCKSDB_JAR = rocksdbjni.jar
 
diff --git a/java/org/rocksdb/Options.java b/java/org/rocksdb/Options.java
index 4c0132e55..cd73aec5c 100644
--- a/java/org/rocksdb/Options.java
+++ b/java/org/rocksdb/Options.java
@@ -507,7 +507,6 @@ public class Options {
     assert(isInitialized());
     return maxBackgroundCompactions(nativeHandle_);
   }
-  private native int maxBackgroundCompactions(long handle);
 
   /*
    * Creates statistics object which collects metrics about database operations.
@@ -561,8 +560,6 @@ public class Options {
     setMaxBackgroundCompactions(nativeHandle_, maxBackgroundCompactions);
     return this;
   }
-  private native void setMaxBackgroundCompactions(
-      long handle, int maxBackgroundCompactions);
 
   /**
    * Returns the maximum number of concurrent background flush jobs.
@@ -1164,14 +1161,11 @@ public class Options {
   private native void setDisableSeekCompaction(
       long handle, boolean disableSeekCompaction);
   private native boolean disableSeekCompaction(long handle);
-<<<<<<< HEAD
   private native void setMaxBackgroundCompactions(
       long handle, int maxBackgroundCompactions);
   private native int maxBackgroundCompactions(long handle);
   private native void createStatistics(long optHandle);
   private native long statisticsPtr(long optHandle);
-=======
->>>>>>> 1a8abe72768b2b5cea800aa390c28e5ace6a552e
 
   long nativeHandle_;
   long cacheSize_;
diff --git a/java/rocksjni/portal.h b/java/rocksjni/portal.h
index 72b252114..024062c0b 100644
--- a/java/rocksjni/portal.h
+++ b/java/rocksjni/portal.h
@@ -172,7 +172,6 @@ class WriteBatchJni {
   }
 };
 
-<<<<<<< HEAD
 class HistogramDataJni {
  public:
   static jmethodID getConstructorMethodId(JNIEnv* env, jclass jclazz) {
@@ -180,7 +179,8 @@ class HistogramDataJni {
         jclazz, "<init>", "(DDDDD)V");
     assert(mid != nullptr);
     return mid;
-=======
+  }
+};
 class BackupableDBOptionsJni {
  public:
   // Get the java class id of org.rocksdb.BackupableDBOptions.
@@ -211,7 +211,6 @@ class BackupableDBOptionsJni {
     env->SetLongField(
         jobj, getHandleFieldID(env),
         reinterpret_cast<jlong>(op));
->>>>>>> 1a8abe72768b2b5cea800aa390c28e5ace6a552e
   }
 };
 }  // namespace rocksdb