add update models
merge conflict