default models
merge conflicts