Added new sprites
Resolved conflict