diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..9a0c70e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+includes/config.php merge=ours