Add merged changes.

source/wp-content/themes/wporg-main-2022/patterns/data-liberation.php

@@ -126,11 +126,7 @@
 <!-- wp:group {"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}},"spacing":{"padding":{"top":"5rem","right":"var:preset|spacing|edge-space","bottom":"5rem","left":"var:preset|spacing|edge-space"}}},"backgroundColor":"blueberry-1","textColor":"white","layout":{"inherit":true,"type":"constrained"}} -->
 <div class="wp-block-group alignfull has-white-color has-blueberry-1-background-color has-text-color has-background has-link-color" id="get-started" style="padding-top:5rem;padding-right:var(--wp--preset--spacing--edge-space);padding-bottom:5rem;padding-left:var(--wp--preset--spacing--edge-space)"><!-- wp:group {"align":"wide","layout":{"type":"flex","flexWrap":"nowrap"}} -->
 <div class="wp-block-group alignwide"><!-- wp:paragraph {"style":{"layout":{"selfStretch":"fixed","flexSize":"65%"},"elements":{"link":{"color":{"text":"var:preset|color|white"}}}},"textColor":"white","fontSize":"heading-4","fontFamily":"eb-garamond"} -->
-<<<<<<< HEAD
 <p class="has-white-color has-text-color has-link-color has-eb-garamond-font-family has-heading-4-font-size"><?php _e( 'Have a workflow, tool, or time to contribute? We’d love help to make the web more open.', 'wporg' ); ?></p>
-=======
-<p class="has-white-color has-text-color has-link-color has-eb-garamond-font-family has-heading-4-font-size">Have a workflow, tool, or time to contribute? We'd love help to make the web more open.</p>
->>>>>>> e4969f3 (Add a callout on the guides page.)
 <!-- /wp:paragraph -->
 
 <!-- wp:buttons {"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal"},"style":{"layout":{"selfStretch":"fill","flexSize":null}}} -->