fix conflicts

Author: josephmje

.github/config.yml

@@ -6,7 +6,7 @@ newPRWelcomeComment: >
   We have detected this is the first time for you to contribute
   to *dMRIPrep*.
   Please check out our [contributing guidelines](https://github.com/nipreps/dmriprep/blob/master/CONTRIBUTING.md).
-
+  
   We invite you to list yourself as a *dMRIPrep* contributor, so if your name
   is not already mentioned, please modify the
   [``.zenodo.json``](https://github.com/nipreps/dmriprep/blob/master/.zenodo.json)
@@ -25,4 +25,4 @@ newPRWelcomeComment: >
   Of course, if you want to opt-out this time there is no
   problem at all with adding your name later.
   You will be always welcome to add it in the future whenever
-  you feel it should be listed.
+  you feel it should be listed.

setup.cfg

@@ -23,16 +23,15 @@ install_requires =
     indexed_gzip >=0.8.8
     nibabel >=2.2.1
     nilearn !=0.5.0, !=0.5.1
-    nipype >=1.2.2
-    niworkflows ~= 0.10.3
+    nipype >=1.2.0
+    niworkflows ~= 0.10.1
     numpy
     pandas
     psutil >=5.4
-    pybids ~= 0.9.3
+    pybids ~= 0.9.2
     pyyaml
     scikit-image
-    sdcflows ~= 0.1.0
-    smriprep ~= 0.3.2
+    smriprep ~= 0.3.0
     statsmodels
     templateflow ~= 0.4.1
 test_requires =