merge from bird_flocks -> bird_critters (combining both flocks and individual birds on this branch)