diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..8dcdc753a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Ignore version on merge
+version.json merge=ours