fix merge conflict

src/main/java/info/textgrid/rep/browse/BrowseController.java

@@ -210,7 +210,7 @@ public class BrowseController {
   }
 
   /**
-   * setup browsing of aggreagtions
+   * setup browsing of aggregations
    *
    * @param model
    * @param i18n
@@ -240,13 +240,15 @@ public class BrowseController {
 
     } else {
       log.info("listing agg: " + id);
-
       List<ResultType> results;
+
       if (format.contains("text/tg.work+xml")) {
-        List<String> editionFilter =
-            Arrays.asList(new String[] {"format:text/tg.edition+tg.aggregation+xml"});
-        results = this.tgsearchClientService
-            .search("isEditionOf:\"" + id + "\"", "relevance", 0, 20, editionFilter, true)
+        results = this.tgsearchClientService.getSearchClient()
+            .searchQuery()
+            .setQuery("*")
+            .addFilter("edition.isEditionOf:"+id)
+            .addFilter("format:text/tg.edition+tg.aggregation+xml")
+            .execute()
             .getResult();
       } else {
         results = this.tgsearchClientService.listAggregation(id).getResult();

src/main/java/info/textgrid/rep/service/TgsearchClientService.java

@@ -103,4 +103,8 @@ public class TgsearchClientService {
     return searchClient.infoQuery().listRevisions(id);
   }
 
+  public SearchClient getSearchClient() {
+    return searchClient;
+  }
+
 }