model, templates changed
conflicts fixed