Add sprites
Merge conflicts