Fix merge conflict

infracost-usage-example.yml

@@ -1379,25 +1379,10 @@ resource_usage:
     data_transfer_local: 2500 # Monthly local traffic through the gateway in GB
     data_transfer_global: 2500 # Monthly global traffic through the gateway in GB
 
-<<<<<<< HEAD
-  ibm_database.postgres:
-    postgresql_database_ram_mb: 12288 # Allocated memory in MB per-member
-    postgresql_database_disk_mb: 131072 # Allocated disk in MB per-member
-    postgresql_database_core: 3 # Allocated dedicated CPU per-member
-    postgresql_database_members: 4 # Allocated number of members in the cluster
-
-  ibm_database.elasticsearch:
-    elasticsearch_database_ram_mb: 12288 # Allocated memory in MB per-member
-    elasticsearch_database_disk_mb: 131072 # Allocated disk in MB per-member
-    elasticsearch_database_core: 3 # Allocated dedicated CPU per-member
-    elasticsearch_database_members: 4 # Allocated number of members in the cluster
-
   ibm_is_share.nfs:
     is-share_monthly_instance_hours: 730 # Monthly number of instance hours
     is-share_monthly_transmitted_gb: 1   # Data transmitted between two file shares for replication
-
-=======
->>>>>>> 8d1c9308 (Remove all usage variables mentions and use)
+
   ibm_is_vpc_server:
     is.vpn-server_CONNECTION_HOURS: 730
     is.vpn-server_INSTANCE_HOURS: 730