added templates
merge