Adding cars
fixed merge