Removed top section of "Subpage Article" template
fix merge conflict
Fixed conflicts in content-news.php