blog.php merge fixes