Fix what I just broke

bench/gen_bench_expectations.py

Index: bench/gen_bench_expectations.py
diff --git a/bench/gen_bench_expectations.py b/bench/gen_bench_expectations.py
index e42bc6301e0dfcde172c4c061fce86f5cb005840..1634914718f2237e6eb1f9d9ef3700bb6a386e27 100644
--- a/bench/gen_bench_expectations.py
+++ b/bench/gen_bench_expectations.py
@@ -48,13 +48,8 @@ def compute_ranges(benches):
   """
   avg = sum(benches) / len(benches)
   squared_avg = avg ** 2
-<<<<<<< HEAD
   avg_sum_squared = sum([bench**2 for bench in benches])/len(benches)
   std_dev = (abs(avg_sum_squared - squared_avg) + 0.05*abs(avg)) ** 0.5
-=======
-  avg_squared = sum([bench**2 for bench in benches])/len(benches)
-  std_dev = (avg_squared - squared_avg) ** 0.5
->>>>>>> origin/master
 
   # If the results are normally distributed, 2 standard deviations
   # captures something like ~95% of the possible range of results I think