Fixed merge conflict for front-page.php