diff --git a/pom.xml b/pom.xml
index 326d1ae..d58c201 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,11 +9,7 @@
org.gcube.accounting
accounting-analytics
-<<<<<<< HEAD
- 3.0.1
-=======
4.0.0-SNAPSHOT
->>>>>>> refs/heads/feature/21353
Accounting Analytics
Accounting Analytics allows querying accounting data. It
diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java b/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java
index 813c73c..4ed96cd 100644
--- a/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java
+++ b/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 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();