diff --git a/systemd.changes b/systemd.changes
index d52772a2..e70c6071 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -90,7 +90,6 @@ Tue Jul 19 11:56:43 UTC 2011 - aj@suse.de
   + add support for systemctl --root
 
 -------------------------------------------------------------------
->>>>>>> .new
 Wed Jun 29 12:54:24 UTC 2011 - fcrozat@suse.com
 
 - Make sure to not start kbd initscript, it is handled by systemd