customer and trip
conflict resolved in user
Merge branch 'master' of https://github.com/acubeinnovations/CC_phase1