car and job_card scaffold added
conflict removed