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/maptools/MapPatcher.jar b/maptools/MapPatcher.jar
new file mode 100644
index 00000000000..5cbaad488c1
Binary files /dev/null and b/maptools/MapPatcher.jar differ
diff --git a/maptools/clean_map.bat b/maptools/clean_map.bat
new file mode 100644
index 00000000000..8ce90510b2e
--- /dev/null
+++ b/maptools/clean_map.bat
@@ -0,0 +1,2 @@
+java -jar MapPatcher.jar -clean ../maps/tgstation.2.0.9.1.dmm.backup ../maps/tgstation.2.0.9.1.dmm ../maps/tgstation.2.0.9.1.dmm
+del ../maps/tgstation.2.0.9.1.dmm.backup
diff --git a/maptools/mapmerge.sh b/maptools/mapmerge.sh
new file mode 100755
index 00000000000..bddb60100e0
--- /dev/null
+++ b/maptools/mapmerge.sh
@@ -0,0 +1,9 @@
+java -jar maptools/MapPatcher.jar -merge $1 $2 $3 $2
+if [ "$?" -gt 0 ]
+then
+    echo "Unable to automatically resolve map conflicts, please merge manually."
+    exit 1
+fi
+java -jar maptools/MapPatcher.jar -clean $1 $2 $2
+
+exit 0
diff --git a/maptools/prepare_map.bat b/maptools/prepare_map.bat
new file mode 100644
index 00000000000..92a1aa44f7e
--- /dev/null
+++ b/maptools/prepare_map.bat
@@ -0,0 +1,2 @@
+cd ../maps
+copy tgstation.2.0.9.1.dmm tgstation.2.0.9.1.dmm.backup