diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..8a313292bb1
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.dmm merge=merge-dmm
diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 00000000000..de5ff6f2542
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,5 @@
+[merge "merge-dmm"]
+    name = mapmerge driver
+    driver = ./mapmerge.sh %O %A %B
+    recursive = text
+
diff --git a/MapPatcher.jar b/MapPatcher.jar
new file mode 100755
index 00000000000..18d5b8f3750
Binary files /dev/null and b/MapPatcher.jar differ
diff --git a/mapmerge.sh b/mapmerge.sh
new file mode 100755
index 00000000000..e5bc0710b25
--- /dev/null
+++ b/mapmerge.sh
@@ -0,0 +1,8 @@
+java -jar MapPatcher.jar -unpack $1 $1 > /dev/null
+java -jar MapPatcher.jar -unpack $2 $2 > /dev/null
+java -jar MapPatcher.jar -unpack $3 $3 > /dev/null
+
+cp $2 original.dmm
+
+echo "Map merge conflict, make sure to repack the map with MapPatcher -pack and clean it with MapPatcher -clean original.dmm"
+exit 0