merge conflict page.tpl