Update assets setup
Update assets setup
Update merge