changes in templates
merge