diff --git a/.gitattributes b/.gitattributes
index cd003ef4..2986db56 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-.travis.yml merge=ours
+.travis.yml merge=keep-ours