Updated template
Merge