added info about car
fixed merge conflict