diff --git a/CHANGELOG.md b/CHANGELOG.md
index d69ea664..a8eb2491 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Changelog
 =========
 
+<<<<<<< HEAD
 2024.06.0 - 2024-06
 -------------------
 
@@ -536,6 +537,16 @@ complete. Please note that the shipped image for PostgreSQL database will be
 deprecated before 1.8.0, you can switch to an external database server by then.
 
 - Deprecation: using the internal postgres image will be deprecated by 1.8.0
+=======
+Notable changes to this project are documented in the current file. For more
+details about individual changes, see the Git log. You should read this before
+upgrading Mailu as some changes will include useful notes.
+
+<!-- TOWNCRIER -->
+v1.7.0 - 2019-08-22
+-------------------
+
+>>>>>>> 089ca7a0 (Prepare release notes for 1.7)
 - Features: Update Fetchmail to 7.0.0, which features more current SSL support ([#891](https://github.com/Mailu/Mailu/issues/891))
 - Features: Relays with authentication ([#958](https://github.com/Mailu/Mailu/issues/958))
 - Features: Fixed hardcoded antispam and antivirus host addresses ([#979](https://github.com/Mailu/Mailu/issues/979))