Conflicts fixed

PlayerSpr still not working properly