add assets
merge