Update with assets
Merge conflict