Adding search for flight.
Resolve merge conflicts