merging mid change in templates to fix error in master