add assets
add assets (merge)