diff --git a/templates/global/breadcrumb.php b/templates/global/breadcrumb.php
index 8a758acd361..7fd227dc03e 100644
--- a/templates/global/breadcrumb.php
+++ b/templates/global/breadcrumb.php
@@ -184,7 +184,11 @@ if ( ( ! is_front_page() && ! ( is_post_type_archive() && get_option( 'page_on_f
 
 		while ( $parent_id ) {
 			$page          = get_page( $parent_id );
+<<<<<<< HEAD
 			$breadcrumbs[] = '<a href="' . get_permalink( $page->ID ) . '">' . get_the_title( $page->ID ) . '</a>';
+=======
+			$breadcrumbs[] = $before . '<a href="' . get_permalink( $page->ID ) . '">' . get_the_title( $page->ID ) . '</a>' . $after . $delimiter;
+>>>>>>> upstream/master
 			$parent_id     = $page->post_parent;
 		}