diff --git a/po/nl.po b/po/nl.po
index 116adf93c..c87ccf886 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -40,17 +40,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gramps\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< .mine
 "POT-Creation-Date: 2013-05-14 10:10+0200\n"
-<<<<<<< .mine
 "PO-Revision-Date: 2013-05-14 23:08+0100\n"
-=======
-"PO-Revision-Date: 2013-05-14 23:08+0100\n"
-=======
-"POT-Creation-Date: 2013-05-14 10:10+0200\n"
-"PO-Revision-Date: 2013-05-14 14:00+0100\n"
->>>>>>> .r22329
->>>>>>> .r22314
 "Last-Translator: Harmen Huizinga\n"
 "Language-Team: nederlands <frederik.de.richter@gmail.com>\n"
 "MIME-Version: 1.0\n"