createTrip
fixed merge conflicts