diff --git a/docs/en/04_Changelogs/4.4.0.md b/docs/en/04_Changelogs/4.4.0.md
index 94ce4bb22..ee36da9c6 100644
--- a/docs/en/04_Changelogs/4.4.0.md
+++ b/docs/en/04_Changelogs/4.4.0.md
@@ -240,8 +240,6 @@ conditions.
 Yes, it will attempt to find the most recent public "hash-less" URL
 for this file and redirect to it.
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 ### Changing the file resolver
 
 The file resolution strategy describes how files are resolved. It relies on a list of file helpers and will iterate through them when looking up files.
diff --git a/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md b/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md
index afbff7a02..6d8756ef5 100644
--- a/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md
+++ b/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md
@@ -479,7 +479,7 @@ will need to be regularly updated.
 * Update the [Slack](https://www.silverstripe.org/community/slack-signup/) topic to include the new release version.
 * For major or minor releases: Work with SilverStripe marketing to get a blog post out.
   They might choose to announce the release on social media as well. 
-
+* If the minor or major release includes security fixes, follow the publication instructions in the [Security Release Process](#security-release-process) section.
 
 ## See also