diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..4fc838a4768491c071a02270ac885cebc4571992
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+dev.ipynb merge=ours
+dev.pyx merge=ours
+dev.pyxbld merge=ours
\ No newline at end of file