Fix for  merge conflict and update to the Template page