added car
conflict resolution