From cef9b015e824d47daa56b8353890b2638d195aab Mon Sep 17 00:00:00 2001
From: Colin Goodheart-Smithe <colings86@users.noreply.github.com>
Date: Wed, 10 Feb 2016 12:20:10 +0000
Subject: [PATCH] fix merge error

---
 .../search/aggregations/metrics/TopHitsTests.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java
index e8994b9c531..7636ccb73be 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java
@@ -125,8 +125,8 @@ public class TopHitsTests extends BaseAggregationTestCase<TopHitsAggregator.TopH
                     factory.sort(SortBuilders.fieldSort(randomAsciiOfLengthBetween(5, 20)).order(randomFrom(SortOrder.values())));
                     break;
                 case 1:
-                    factory.sort(SortBuilders.geoDistanceSort(randomAsciiOfLengthBetween(5, 20))
-                            .geohashes(AbstractQueryTestCase.randomGeohash(1, 12)).order(randomFrom(SortOrder.values())));
+                    factory.sort(SortBuilders.geoDistanceSort(randomAsciiOfLengthBetween(5, 20), AbstractQueryTestCase.randomGeohash(1, 12))
+                            .order(randomFrom(SortOrder.values())));
                     break;
                 case 2:
                     factory.sort(SortBuilders.scoreSort().order(randomFrom(SortOrder.values())));