New sprite
Fix merge conflict