fixed passenger merge I think

Signed-off-by: Michael Maloof <michaelmaloof1991@gmail.com>