diff --git a/model/Blog.php b/model/Blog.php
index 9f1078f..7bb18b9 100755
--- a/model/Blog.php
+++ b/model/Blog.php
@@ -94,15 +94,9 @@ class Blog extends Page {
 	**/
 	public function getExcludedSiteTreeClassNames() {
 		$classes = array();
-<<<<<<< HEAD
 		$tmpClasses = $this->allowedChildren();
 		foreach($tmpClasses as $class) {
 			if(!Config::inst()->get($class, "show_in_sitetree")) {
-=======
-		$tmpClasses = ClassInfo::subClassesFor("BlogPost");
-		if(!Config::inst()->get(get_class($this), "show_in_sitetree")) {
-			foreach($tmpClasses as $class) {
->>>>>>> 7d178790f605ae8740a99f1804801e6d985ca755
 				$classes[$class] = $class;
 			}
 		}
@@ -411,4 +405,4 @@ class Blog_Controller extends Page_Controller {
 		return $this->Link("rss");
 	}
 
-}
\ No newline at end of file
+}