debug big merge
merge passengers with master