test models
resole conflict