Class car fixed.
conflict resovlced