Wing removed trailing whitespace.
LandingTurnOffRunway fix where Fast phase stop == Landing phase stop.
Resolved conflicts in derived_parameters and key_time_instance.py
Resolved conflict in derived_parameters and key_time_instances.py