fix merge fallout (take 2)
fix merge fallout (take 2)

bgould/avian,marcinolawski/avian,getlantern/avian,bgould/avian,bigfatbrowncat/avian-pack.avian,MaartenR/avian,bigfatbrowncat/avian-pack.avian,joshuawarner32/avian,getlantern/avian,joshuawarner32/avian,minor-jason/avian,MaartenR/avian,lostdj/avian,marcinolawski/avian,lostdj/avian,joshuawarner32/avian,marcinolawski/avian,minor-jason/avian,bigfatbrowncat/avian-pack.avian,minor-jason/avian,lwahlmeier/avian,joshuawarner32/avian,MaartenR/avian,marcinolawski/avian,bigfatbrowncat/avian-pack.avian,MaartenR/avian,dicej/avian,lwahlmeier/avian,lostdj/avian,dicej/avian,bgould/avian,ucdseniordesign/avian,getlantern/avian,lwahlmeier/avian,lostdj/avian,ucdseniordesign/avian,dicej/avian,bgould/avian,lwahlmeier/avian,ucdseniordesign/avian,minor-jason/avian,ucdseniordesign/avian,getlantern/avian,dicej/avian