fixes after merge

dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java

@@ -151,7 +151,7 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
 
     @Override
     public Asset saveAsset(Asset asset, NameConflictStrategy nameConflictStrategy) {
-        return saveEntity(asset, () -> saveAsset(asset, true, NameConflictStrategy.DEFAULT));
+        return saveEntity(asset, () -> saveAsset(asset, true, nameConflictStrategy));
     }
 
     @Override

dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java

@@ -153,6 +153,9 @@ public class CustomerServiceImpl extends AbstractCachedEntityService<CustomerCac
         return saveEntity(customer, () -> saveCustomer(customer, true, nameConflictStrategy));
     }
 
+    private Customer saveCustomer(Customer customer, boolean doValidate) {
+        return saveCustomer(customer, doValidate, NameConflictStrategy.DEFAULT);
+    }
 
     private Customer saveCustomer(Customer customer, boolean doValidate, NameConflictStrategy nameConflictStrategy) {
         log.trace("Executing saveCustomer [{}]", customer);