diff --git a/.gitattributes b/.gitattributes
index 300d63bdbf8..278ace47a4f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
 /build export-ignore
+
 *.php diff=php
-composer.json merge=ours
-src/Runner/Version.php merge=ours
+