diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..953bd7d6
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+gns3server/version.py merge=ours
+