fix car
merge