diff --git a/debian/changelog b/debian/changelog
index c9ba78f12..e6571ece3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@
 
   * Bump release.
 
- -- Jasmine Iwanek <jriwanek@gmail.com>  Sat, 29 Jul 2023 17:32:30 +0200
+ -- Jasmine Iwanek <jriwanek@gmail.com>  Thu, 12 Oct 2023 00:00:31 +0200
diff --git a/src/unix/assets/86Box.spec b/src/unix/assets/86Box.spec
index 4bc29d2ce..65f545dc1 100644
--- a/src/unix/assets/86Box.spec
+++ b/src/unix/assets/86Box.spec
@@ -121,5 +121,9 @@ popd
 %{_datadir}/%{name}/roms
 
 %changelog
+<<<<<<< HEAD
 * Sat Aug 26 2023 Robert de Rooy <robert.de.rooy[AT]gmail.com> 4.1-1
+=======
+* Thu Oct 12 2023 Robert de Rooy <robert.de.rooy[AT]gmail.com> 4.0.1-1
+>>>>>>> origin/master
 - Bump release