Fixed conflicts

pom.xml

@@ -9,11 +9,7 @@
 
 	<groupId>org.gcube.accounting</groupId>
 	<artifactId>accounting-analytics</artifactId>
-<<<<<<< HEAD
-	<version>3.0.1</version>
-=======
 	<version>4.0.0-SNAPSHOT</version>
->>>>>>> refs/heads/feature/21353
 	<name>Accounting Analytics</name>
 	<description>
 		Accounting Analytics allows querying accounting data. It

src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java

@@ -99,15 +99,11 @@ public class AccountingPersistenceQuery implements AccountingPersistenceBackendQ
 		AggregatedRecord<?, ?> instance = clz.newInstance();
 
 		// limit filter key for accounting storage status (used from portlet
-		// accounting for tab space)
+		// accounting for tad space)
 		if (clz.equals(AggregatedStorageStatusRecord.class)) {
 			SortedSet<String> storageStatus = new TreeSet<>();
 			storageStatus.add(AggregatedStorageStatusRecord.CONSUMER_ID);
-<<<<<<< HEAD
-			storageStatus.add(AggregatedStorageStatusRecord.PROVIDER_URI);
-=======
 			// storageStatus.add(AggregatedStorageStatusRecord.DATA_SERVICEID);
->>>>>>> refs/heads/feature/21353
 			return storageStatus;
 		} else {
 			return instance.getQuerableKeys();