fix the rebase

spearhead/assets/sass/_block-extends.scss

@@ -2,10 +2,6 @@
 @import "block-extends/categories";
 @import "block-extends/latest-posts";
 @import "block-extends/links";
-<<<<<<< HEAD
-@import "block-extends/related-posts";
-@import "block-extends/search";
-=======
 @import "block-extends/navigation";
 @import "block-extends/related-posts";
->>>>>>> Use the navigation block for the podcast links
+@import "block-extends/search";

spearhead/inc/block-patterns.php

@@ -70,15 +70,6 @@ if ( ! function_exists( 'spearhead_register_block_patterns' ) ) :
 						<!-- /wp:navigation -->',
 				)
 			);
-
-			register_block_pattern(
-				'spearhead/podcast-links-list',
-				array(
-					'title'      => __( 'Podcast links list', 'spearhead' ),
-					'categories' => array( 'spearhead' ),
-					'content'    => '<!-- wp:paragraph {"className":"podcast-links-list-block","style":{"typography":{"fontSize":18}}} --><p class="podcast-links-list-block" style="font-size:18px"><a rel="noreferrer noopener" target="_blank" href="https://www.apple.com/">Apple </a>•<a rel="noreferrer noopener" target="_blank" href="https://www.breaker.audio/">Breaker </a>•<a rel="noreferrer noopener" target="_blank" href="https://www.google.com/">Google </a>•<a rel="noreferrer noopener" target="_blank" href="https://www.linkedin.com/">LinkedIn </a>•<a rel="noreferrer noopener" target="_blank" href="https://overcast.fm/">Overcast </a>•<a rel="noreferrer noopener" target="_blank" href="https://www.spotify.com/">Spotify </a>•<a rel="noreferrer noopener" target="_blank" href="https://twitter.com/">Twitter </a>•<a href="https://www.youtube.com/" target="_blank" rel="noreferrer noopener">YouTube</a></p><!-- /wp:paragraph -->',
-				)
-			);
 		}
 
 		/**

spearhead/style-rtl.css

@@ -372,8 +372,6 @@ ul.wp-block-categories,
 	margin-right: 0;
 }
 
-<<<<<<< HEAD
-=======
 .wp-block-navigation .wp-block-navigation__container .wp-block-navigation-link {
 	margin: 0 calc( 0.5 * var(--global--spacing-unit));
 }
@@ -384,7 +382,6 @@ ul.wp-block-categories,
 	padding: 0;
 }
 
->>>>>>> Use the navigation block for the podcast links
 .wp-block-jetpack-related-posts .jp-related-posts-i2__post {
 	margin: 0 0 0 var(--global--spacing-horizontal);
 }
@@ -407,7 +404,6 @@ ul.wp-block-categories,
 	text-transform: uppercase;
 }
 
-<<<<<<< HEAD
 .wp-block-search.wp-block-search__icon-button.wp-block-search__button-inside .wp-block-search__button {
 	padding: var(--button--padding-vertical) var(--button--padding-horizontal);
 }
@@ -463,8 +459,6 @@ ul.wp-block-categories,
 	border-bottom: var(--form--border-width) solid var(--form--border-color);
 }
 
-=======
->>>>>>> Use the navigation block for the podcast links
 .screen-reader-text, .search-form input[type="submit"] {
 	/* Text meant only for screen readers. */
 	border: 0;

spearhead/style.css

@@ -372,8 +372,6 @@ ul.wp-block-categories,
 	margin-left: 0;
 }
 
-<<<<<<< HEAD
-=======
 .wp-block-navigation .wp-block-navigation__container .wp-block-navigation-link {
 	margin: 0 calc( 0.5 * var(--global--spacing-unit));
 }
@@ -384,7 +382,6 @@ ul.wp-block-categories,
 	padding: 0;
 }
 
->>>>>>> Use the navigation block for the podcast links
 .wp-block-jetpack-related-posts .jp-related-posts-i2__post {
 	margin: 0 var(--global--spacing-horizontal) 0 0;
 }
@@ -407,7 +404,6 @@ ul.wp-block-categories,
 	text-transform: uppercase;
 }
 
-<<<<<<< HEAD
 .wp-block-search.wp-block-search__icon-button.wp-block-search__button-inside .wp-block-search__button {
 	padding: var(--button--padding-vertical) var(--button--padding-horizontal);
 }
@@ -463,8 +459,6 @@ ul.wp-block-categories,
 	border-bottom: var(--form--border-width) solid var(--form--border-color);
 }
 
-=======
->>>>>>> Use the navigation block for the podcast links
 .screen-reader-text, .search-form input[type="submit"] {
 	/* Text meant only for screen readers. */
 	border: 0;