diff --git a/Paginator/RawPaginatorAdapter.php b/Paginator/RawPaginatorAdapter.php
index 7e2d49b..e6b6887 100644
--- a/Paginator/RawPaginatorAdapter.php
+++ b/Paginator/RawPaginatorAdapter.php
@@ -132,7 +132,6 @@ class RawPaginatorAdapter implements PaginatorAdapterInterface
 
         return $this->facets;
     }
-<<<<<<< HEAD
     
     /**
      * Returns Aggregations
@@ -146,9 +145,6 @@ class RawPaginatorAdapter implements PaginatorAdapterInterface
 
         return $this->aggregations;
     }
-    
-=======
->>>>>>> upstream/master
 
     /**
      * Returns the Query