remove unnecessary assets
merge conflicts