Merged the new template