delete unused assets and add new assets
fix merge conflict