updating models
merge