add assets
merge code