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
diff --git a/requirements.txt b/requirements.txt
index 968b34a4341103fb6b36de78e9ab1703f0902718..7bcdc2d8b5729aaedcb5f8d32bc709d7d0a7e844 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 Cython==0.29.21
-CythonGSL==0.2.3
+CythonGSL==0.2.2
 h5py==2.10.0
 numpy==1.19.1
 scipy==1.5.2