Working template changes
Merge conflict