Merging template changes