car model final
conflict solve