Fix merge
Fix new asset creation