Added Sprite sheet
Conflict resolution