House and Senate negotiate bill to help FAA add more air traffic controllers and safety inspectors