diff --git a/core/modules/help_topics/help_topics/content_moderation.changing_states.html.twig b/core/modules/help_topics/help_topics/content_moderation.changing_states.html.twig
index bdad9a4da8..80b8e40bb6 100644
--- a/core/modules/help_topics/help_topics/content_moderation.changing_states.html.twig
+++ b/core/modules/help_topics/help_topics/content_moderation.changing_states.html.twig
@@ -11,7 +11,6 @@ related:
 {% set content_moderation_permissions_link = render_var(help_route_link(content_moderation_permissions_link_text, 'user.admin_permissions', {}, {'fragment': 'module-content_moderation'})) %}
 {% set content_link_text %}{% trans %}Content{% endtrans %}{% endset %}
 {% set content_link = render_var(help_route_link(content_link_text, 'system.admin_content')) %}
->>>>>>> Applying patch from issue 3215784 comment 23
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Change the workflow state of a particular entity. See {{ workflows_overview_topic }} for an overview of workflows, and {{ content_structure_topic }} for an overview of content entities.{% endtrans %}</p>
 <h2>{% trans %}Who can change workflow states?{% endtrans %}</h2>
diff --git a/core/modules/help_topics/help_topics/content_moderation.configuring_workflows.html.twig b/core/modules/help_topics/help_topics/content_moderation.configuring_workflows.html.twig
index 9bc93f53eb..5dad84f6e4 100644
--- a/core/modules/help_topics/help_topics/content_moderation.configuring_workflows.html.twig
+++ b/core/modules/help_topics/help_topics/content_moderation.configuring_workflows.html.twig
@@ -16,7 +16,6 @@ related:
 {% set workflows_permissions_link = render_var(help_route_link(workflows_permissions_link_text, 'user.admin_permissions', {}, {'fragment': 'module-workflows'})) %}
 {% set workflows_link_text %}{% trans %}Workflows{% endtrans %}{% endset %}
 {% set workflows_link = render_var(help_route_link(workflows_link_text, 'entity.workflow.collection')) %}
->>>>>>> Applying patch from issue 3215784 comment 23
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Create or edit a workflow with various workflow states (for example <em>Concept</em>, <em>Archived</em>, etc.) for moderating content. See {{ workflows_overview_topic }} for more information on workflows.{% endtrans %}</p>
 <h2>{% trans %}Who can configure a workflow?{% endtrans %}</h2>