fixed merge conflict with page.php