analyze models new
merge conflicts