Fix merge problems

Maybe we screwed the car class