add asset merging
bump version