new models
merge the conficts