jeffrey added passenger
fixed merge conflict