new templates
Merge