Assets update
Merge conflict