fix conflicts in content-home.php