diff --git a/debian/changelog b/debian/changelog
index 2ee39844e..43ecb1e7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,7 +63,6 @@ yunohost (11.2.28) stable; urgency=low
   Thanks to all contributors <3 ! (cjdw, Emmanuel Averty, Ivan Davydov, ljf, ppr, Tagada, tituspijean, xabirequejo)
 
  -- Alexandre Aubin <alex.aubin@mailoo.org>  Sun, 25 Aug 2024 13:17:43 +0200
->>>>>>> origin/dev
 
 yunohost (11.2.27) stable; urgency=low