models and templates
merge Conflicts