updated content-page and content templates to fix merge errors