diff --git a/comp/src/gb.term.form/.lang/nl.po b/comp/src/gb.term.form/.lang/nl.po
index 7b691bb2a..c59b05862 100644
--- a/comp/src/gb.term.form/.lang/nl.po
+++ b/comp/src/gb.term.form/.lang/nl.po
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-#Willy Raets < gbWilly@openmailbox.org >, 2017
-=======
 # Willy Raets < gbWilly@openmailbox.org >, 2017
->>>>>>> a247c14d24b8edc4533cba6bf1b9240a4bf1463a
 #, fuzzy
 msgid ""
 msgstr ""