diff --git a/debian/changelog b/debian/changelog
index 33c154102c04..eb10c320dcd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -224,7 +224,6 @@ linux-2.6 (3.2.17-1) unstable; urgency=low
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 12 May 2012 15:29:09 +0100
 
->>>>>>> .merge-right.r19023
 linux-2.6 (3.2.16-1) unstable; urgency=low
 
   * New upstream stable update: