car is now driving in circles!
fixed conflicts
fixed conflicts