Updated template.
Fixed merge conflicts.