fixed fixtures for new model
fixed conflicts