fixed flying
large merge butts with birdman and respawn
still resolving merges