fixed up new flight
merge cf on flight index (used new)
no changes plz
merge problems