fix merge problems

Author: david-blasby

modules/services/ogc-api-records/src/main/java/org/fao/geonet/ogcapi/records/controller/ItemApiController.java

@@ -293,7 +293,6 @@ public ResponseEntity<Void> collectionsCollectionIdItemsGet(
           || mediaType.equals(GnMediaType.APPLICATION_JSON_LD)
           || mediaType.equals(MediaType.APPLICATION_JSON)
           || mediaType.equals(GnMediaType.APPLICATION_RDF_XML);
-          || mediaType.equals(GnMediaType.APPLICATION_RDF_XML);
 
       return collectionsCollectionIdItemsGetInternal(
           query,
@@ -503,7 +502,6 @@ private String search(
       Query requestQuery,
       HttpServletRequest request,
       boolean allSourceFields) {
-      HttpServletRequest request, boolean allSourceFields) {
 
     Source source = collectionService.retrieveSourceForCollection(requestQuery.getCollectionId());
 
@@ -641,4 +639,4 @@ private String getResponseContentType(HttpServletRequest request) {
 
     return mediaType;
   }
-}
+}