From 210be978b1bfe209060c9820bd885714b508ecf9 Mon Sep 17 00:00:00 2001
From: Colin Goodheart-Smithe <colings86@users.noreply.github.com>
Date: Wed, 9 Dec 2015 14:56:19 +0000
Subject: [PATCH] fixed merge errors

---
 .../aggregations/metrics/stats/StatsAggregator.java       | 2 +-
 .../search/aggregations/metrics/StatsTests.java           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregator.java
index f56e4039c9f..2df3d89d70f 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregator.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregator.java
@@ -182,7 +182,7 @@ public class StatsAggregator extends NumericMetricsAggregator.MultiValue {
         @Override
         protected ValuesSourceAggregatorFactory<Numeric> innerReadFrom(String name, ValuesSourceType valuesSourceType,
                 ValueType targetValueType, StreamInput in) {
-            return new StatsAggegator.Factory(name);
+            return new StatsAggregator.Factory(name);
         }
 
         @Override
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java
index d793227c014..a09958d61b0 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsTests.java
@@ -19,13 +19,13 @@
 
 package org.elasticsearch.search.aggregations.metrics;
 
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggegator;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregator;
 
-public class StatsTests extends AbstractNumericMetricTestCase<StatsAggegator.Factory> {
+public class StatsTests extends AbstractNumericMetricTestCase<StatsAggregator.Factory> {
 
     @Override
-    protected StatsAggegator.Factory doCreateTestAggregatorFactory() {
-        return new StatsAggegator.Factory("foo");
+    protected StatsAggregator.Factory doCreateTestAggregatorFactory() {
+        return new StatsAggregator.Factory("foo");
     }
 
 }