diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java
index c25de33f3302..a19b6ffbec64 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java
@@ -528,7 +528,6 @@ public boolean isReplicationPeerModificationEnabled() {
   }
 
   @Override
-<<<<<<< HEAD
   public ReplicationLogCleanerBarrier getReplicationLogCleanerBarrier() {
     return null;
   }