assets refactoring
merge conflict