fixed the model conflict