More Image Assets!
Fixing merge conflicts