model changes
model conflict fix