diff --git a/docs/releases.rst b/docs/releases.rst
index 0a22ce34..b4aa38da 100644
--- a/docs/releases.rst
+++ b/docs/releases.rst
@@ -1,6 +1,7 @@
 Release notes
 =============
 
+<<<<<<< HEAD
 Mailu 2024.06 - 2024-06
 -----------------------
 
@@ -742,6 +743,8 @@ Update your DNS SPF Records
 It has become known that the SPF DNS records generated by the admin interface are not completely standard compliant anymore. Please check the DNS records for your domains and compare them to what the new admin-interface instructs you to use. In most cases, this should be a simple copy-paste operation for you ….
 
 
+=======
+>>>>>>> a640756b (Add proper release notes for 1.7)
 Mailu 1.7 - 2019-08-22
 ----------------------
 
@@ -753,10 +756,16 @@ New functionality
 `````````````````
 
 Most changes are internal, main features include:
+<<<<<<< HEAD
 
 - the admin UI now properly displaying on mobile
 - relays supporting authentication thanks to new settings
 - ability to create an initial admin user using environment variables
+=======
+ - the admin UI now properly displaying on mobile
+ - relays supporting authentication thanks to new settings
+ - ability to create an initial admin user using environment variables
+>>>>>>> a640756b (Add proper release notes for 1.7)
 
 Other changes include software updates with some new features in Rainloop
 1.30.0.
@@ -764,7 +773,11 @@ Other changes include software updates with some new features in Rainloop
 Back-end
 ````````
 
+<<<<<<< HEAD
 One of the big tasks was upgrading to latest Alpine (3.10), which is now finished.
+=======
+One of the big tasks was upgradig to latest Alpine (3.10), which is now finished.
+>>>>>>> a640756b (Add proper release notes for 1.7)
 Also, a lot was improved about the environment variables meant to provide
 specific hosts in custom setups.
 
@@ -788,7 +801,11 @@ configuration and upgrade your mailu.env.
 
 If you run the PostgreSQL server, the database was upgrade, so you will need to
 dump the database before upgrading and load the dump after the upgrade is
+<<<<<<< HEAD
 complete. Please note that the shipped image for PostgreSQL database will be
+=======
+complete. Please not that the shipped image for PostgreSQL database will be
+>>>>>>> a640756b (Add proper release notes for 1.7)
 deprecated before 1.8.0, you can switch to an external database server by then.