added assets
merging