playerSprite
merge
minimum restored
tidy up