diff --git a/docs/en/04_Changelogs/4.4.0.md b/docs/en/04_Changelogs/4.4.0.md
index 0edd05300..94ce4bb22 100644
--- a/docs/en/04_Changelogs/4.4.0.md
+++ b/docs/en/04_Changelogs/4.4.0.md
@@ -240,6 +240,7 @@ 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