diff --git a/comp/src/gb.form.mdi/.component b/comp/src/gb.form.mdi/.component
index 46498038f..d4569b1ea 100644
--- a/comp/src/gb.form.mdi/.component
+++ b/comp/src/gb.form.mdi/.component
@@ -1,10 +1,6 @@
 [Component]
 Key=gb.form.mdi
-<<<<<<< HEAD
-Version=3.10.90
-=======
 Version=3.12.90
->>>>>>> a247c14d24b8edc4533cba6bf1b9240a4bf1463a
 Authors=Benoît Minisini
 Needs=Form
 Requires=gb.form,gb.settings
diff --git a/comp/src/gb.form.mdi/.project b/comp/src/gb.form.mdi/.project
index 247fdb50b..7781b62fe 100644
--- a/comp/src/gb.form.mdi/.project
+++ b/comp/src/gb.form.mdi/.project
@@ -1,15 +1,8 @@
 # Gambas Project File 3.0
-<<<<<<< HEAD
-# Compiled with Gambas 3.10.90
-Title=Multiple document interface management
-Startup=FMain2
-Version=3.10.90
-=======
 Title=Multiple document interface management
 Startup=FMain
 Icon=.hidden/control/workspace.png
 Version=3.12.90
->>>>>>> a247c14d24b8edc4533cba6bf1b9240a4bf1463a
 VersionFile=1
 Component=gb.image
 Component=gb.gui
diff --git a/comp/src/gb.term.form/.lang/nl.po b/comp/src/gb.term.form/.lang/nl.po
new file mode 100644
index 000000000..f46424453
--- /dev/null
+++ b/comp/src/gb.term.form/.lang/nl.po
@@ -0,0 +1,15 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: gb.term.form 3.13.0\n"
+"PO-Revision-Date: 2019-05-18 13:57 UTC\n"
+"Last-Translator: gbWilly <gbWilly@openmailbox.org>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: .project:2
+msgid "This components allows to dialog with a VT102 terminal.\n\nIt provides a way to use common visual objects like windows, standard controls like labels, checkboxes, lists and so on... as in graphical mode.\n\nIt will also provide a standalone class with common VT100 commands to be used by more simple applications."
+msgstr "Dit component staat de dialoog toe met een VT102 terminal.\n\nHet voorziet in een manier om gebruikelijke visuele objecten zoals vensters, standaart controls zoals labels,checkboxen, en zo verder te gebruiken...zoals in grafische modus.\n\nHet voorziet ook in een alleenstaande klasse met gebruikelijke VT100 commando's voor gebruik in eenvoudigere applicaties."
+