diff --git a/hystrix-core/src/jmh/java/com/netflix/hystrix/perf/RollingMaxPerfTest.java b/hystrix-core/src/jmh/java/com/netflix/hystrix/perf/RollingMaxPerfTest.java
index a1d9a71a0..6f095567f 100644
--- a/hystrix-core/src/jmh/java/com/netflix/hystrix/perf/RollingMaxPerfTest.java
+++ b/hystrix-core/src/jmh/java/com/netflix/hystrix/perf/RollingMaxPerfTest.java
@@ -18,7 +18,6 @@
 import java.util.concurrent.TimeUnit;
 
 public class RollingMaxPerfTest {
-<<<<<<< HEAD
     @State(Scope.Thread)
     public static class CounterState {
         HystrixRollingNumber counter;
@@ -118,105 +117,4 @@ public long readHeavyReadMetrics(CounterState counterState) {
         HystrixRollingNumber counter = counterState.counter;
         return counter.getRollingMaxValue(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE);
     }
-=======
-	@State(Scope.Thread)
-	public static class CounterState {
-		HystrixRollingNumber counter;
-
-		@Setup(Level.Iteration)
-		public void setUp() {
-			counter = new HystrixRollingNumber(
-					HystrixProperty.Factory.asProperty(100),
-					HystrixProperty.Factory.asProperty(10));
-		}
-	}
-
-	@State(Scope.Thread)
-	public static class ValueState {
-		final Random r = new Random();
-
-		int value;
-
-		@Setup(Level.Invocation)
-		public void setUp() {
-			value = r.nextInt(100);
-		}
-	}
-
-	@Benchmark
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public HystrixRollingNumber writeOnly(CounterState counterState, ValueState valueState) {
-		counterState.counter.updateRollingMax(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE, valueState.value);
-		return counterState.counter;
-	}
-
-	@Benchmark
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public long readOnly(CounterState counterState) {
-		HystrixRollingNumber counter = counterState.counter;
-		return counter.getRollingMaxValue(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE);
-	}
-
-	@Benchmark
-	@Group("writeHeavy")
-	@GroupThreads(7)
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public HystrixRollingNumber writeHeavyUpdateMax(CounterState counterState, ValueState valueState) {
-		counterState.counter.updateRollingMax(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE, valueState.value);
-		return counterState.counter;
-	}
-
-	@Benchmark
-	@Group("writeHeavy")
-	@GroupThreads(1)
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public long writeHeavyReadMetrics(CounterState counterState) {
-		HystrixRollingNumber counter = counterState.counter;
-		return counter.getRollingMaxValue(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE);
-	}
-
-	@Benchmark
-	@Group("evenSplit")
-	@GroupThreads(4)
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public HystrixRollingNumber evenSplitUpdateMax(CounterState counterState, ValueState valueState) {
-		counterState.counter.updateRollingMax(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE, valueState.value);
-		return counterState.counter;
-	}
-
-	@Benchmark
-	@Group("evenSplit")
-	@GroupThreads(4)
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public long evenSplitReadMetrics(CounterState counterState) {
-		HystrixRollingNumber counter = counterState.counter;
-		return counter.getRollingMaxValue(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE);
-	}
-
-	@Benchmark
-	@Group("readHeavy")
-	@GroupThreads(1)
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public HystrixRollingNumber readHeavyUpdateMax(CounterState counterState, ValueState valueState) {
-		counterState.counter.updateRollingMax(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE, valueState.value);
-		return counterState.counter;
-	}
-
-	@Benchmark
-	@Group("readHeavy")
-	@GroupThreads(7)
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public long readHeavyReadMetrics(CounterState counterState) {
-		HystrixRollingNumber counter = counterState.counter;
-		return counter.getRollingMaxValue(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE);
-	}
->>>>>>> rollback-hdr-histogram
 }
diff --git a/hystrix-core/src/jmh/java/com/netflix/hystrix/perf/RollingNumberPerfTest.java b/hystrix-core/src/jmh/java/com/netflix/hystrix/perf/RollingNumberPerfTest.java
index 536e9fd7d..b20a76c39 100644
--- a/hystrix-core/src/jmh/java/com/netflix/hystrix/perf/RollingNumberPerfTest.java
+++ b/hystrix-core/src/jmh/java/com/netflix/hystrix/perf/RollingNumberPerfTest.java
@@ -18,7 +18,6 @@
 import java.util.concurrent.TimeUnit;
 
 public class RollingNumberPerfTest {
-<<<<<<< HEAD
     @State(Scope.Thread)
     public static class CounterState {
         HystrixRollingNumber counter;
@@ -152,139 +151,4 @@ public long readHeavyReadMetrics(CounterState counterState) {
                 counter.getRollingSum(HystrixRollingNumberEvent.FAILURE) +
                 counter.getRollingSum(HystrixRollingNumberEvent.TIMEOUT);
     }
-=======
-	@State(Scope.Thread)
-	public static class CounterState {
-		HystrixRollingNumber counter;
-
-		@Setup(Level.Iteration)
-		public void setUp() {
-			counter = new HystrixRollingNumber(
-					HystrixProperty.Factory.asProperty(100),
-					HystrixProperty.Factory.asProperty(10));
-		}
-	}
-
-	@State(Scope.Thread)
-	public static class ValueState {
-		final Random r = new Random();
-
-		int value;
-		HystrixRollingNumberEvent type;
-
-		@Setup(Level.Invocation)
-		public void setUp() {
-			value = r.nextInt(100);
-			int typeInt = r.nextInt(3);
-			switch(typeInt) {
-				case 0:
-					type = HystrixRollingNumberEvent.SUCCESS;
-					break;
-				case 1:
-					type = HystrixRollingNumberEvent.FAILURE;
-					break;
-				case 2:
-					type = HystrixRollingNumberEvent.TIMEOUT;
-					break;
-				default: throw new RuntimeException("Unexpected : " + typeInt);
-			}
-		}
-	}
-
-	@Benchmark
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public HystrixRollingNumber writeOnly(CounterState counterState, ValueState valueState) {
-		counterState.counter.add(valueState.type, valueState.value);
-		return counterState.counter;
-	}
-
-	@Benchmark
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public long readOnly(CounterState counterState) {
-		HystrixRollingNumber counter = counterState.counter;
-		return counter.getCumulativeSum(HystrixRollingNumberEvent.SUCCESS) +
-				counter.getCumulativeSum(HystrixRollingNumberEvent.FAILURE) +
-				counter.getCumulativeSum(HystrixRollingNumberEvent.TIMEOUT) +
-				counter.getRollingSum(HystrixRollingNumberEvent.SUCCESS) +
-				counter.getRollingSum(HystrixRollingNumberEvent.FAILURE) +
-				counter.getRollingSum(HystrixRollingNumberEvent.TIMEOUT);
-	}
-
-	@Benchmark
-	@Group("writeHeavy")
-	@GroupThreads(7)
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public HystrixRollingNumber writeHeavyCounterAdd(CounterState counterState, ValueState valueState) {
-		counterState.counter.add(valueState.type, valueState.value);
-		return counterState.counter;
-	}
-
-	@Benchmark
-	@Group("writeHeavy")
-	@GroupThreads(1)
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public long writeHeavyReadMetrics(CounterState counterState) {
-		HystrixRollingNumber counter = counterState.counter;
-		return counter.getCumulativeSum(HystrixRollingNumberEvent.SUCCESS) +
-				counter.getCumulativeSum(HystrixRollingNumberEvent.FAILURE) +
-				counter.getCumulativeSum(HystrixRollingNumberEvent.TIMEOUT) +
-				counter.getRollingSum(HystrixRollingNumberEvent.SUCCESS) +
-				counter.getRollingSum(HystrixRollingNumberEvent.FAILURE) +
-				counter.getRollingSum(HystrixRollingNumberEvent.TIMEOUT);
-	}
-
-	@Benchmark
-	@Group("evenSplit")
-	@GroupThreads(4)
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public HystrixRollingNumber evenSplitCounterAdd(CounterState counterState, ValueState valueState) {
-		counterState.counter.add(valueState.type, valueState.value);
-		return counterState.counter;
-	}
-
-	@Benchmark
-	@Group("evenSplit")
-	@GroupThreads(4)
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public long evenSplitReadMetrics(CounterState counterState) {
-		HystrixRollingNumber counter = counterState.counter;
-		return counter.getCumulativeSum(HystrixRollingNumberEvent.SUCCESS) +
-				counter.getCumulativeSum(HystrixRollingNumberEvent.FAILURE) +
-				counter.getCumulativeSum(HystrixRollingNumberEvent.TIMEOUT) +
-				counter.getRollingSum(HystrixRollingNumberEvent.SUCCESS) +
-				counter.getRollingSum(HystrixRollingNumberEvent.FAILURE) +
-				counter.getRollingSum(HystrixRollingNumberEvent.TIMEOUT);
-	}
-
-	@Benchmark
-	@Group("readHeavy")
-	@GroupThreads(1)
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public HystrixRollingNumber readHeavyCounterAdd(CounterState counterState, ValueState valueState) {
-		counterState.counter.add(valueState.type, valueState.value);
-		return counterState.counter;
-	}
-
-	@Benchmark
-	@Group("readHeavy")
-	@GroupThreads(7)
-	@BenchmarkMode({Mode.Throughput})
-	@OutputTimeUnit(TimeUnit.MILLISECONDS)
-	public long readHeavyReadMetrics(CounterState counterState) {
-		HystrixRollingNumber counter = counterState.counter;
-		return counter.getCumulativeSum(HystrixRollingNumberEvent.SUCCESS) +
-				counter.getCumulativeSum(HystrixRollingNumberEvent.FAILURE) +
-				counter.getCumulativeSum(HystrixRollingNumberEvent.TIMEOUT) +
-				counter.getRollingSum(HystrixRollingNumberEvent.SUCCESS) +
-				counter.getRollingSum(HystrixRollingNumberEvent.FAILURE) +
-				counter.getRollingSum(HystrixRollingNumberEvent.TIMEOUT);
-	}
->>>>>>> rollback-hdr-histogram
 }