diff --git a/.gitattributes b/.gitattributes
index 8730c6c..7b1bc7c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-*.conf text
+*.conf diff merge text