diff --git a/debian/changelog b/debian/changelog
index c914c638..16f39eb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,15 +15,9 @@ shadow (1:4.2-2) UNRELEASED; urgency=low
     This will allow initscripts to drop /etc/init.d/motd.
     Closes: #741129
 
-<<<<<<< HEAD
-  [ Trần Ngọc Quân ]
-  * Vietnamese translation update.
-
   [ Laurent Bigonville ]
   * Enable libaudit support. Closes: #745774
 
-=======
->>>>>>> parent of 0274441... Vietnamese translation update.
  -- Christian Perrier <bubulle@debian.org>  Wed, 30 Apr 2014 22:14:23 +0200
 
 shadow (1:4.2-1) experimental; urgency=low