fix conflicts

Author: josephmje

README.rst

@@ -3,20 +3,20 @@ dmriprep
 ========
 
 .. image:: https://badgen.net/badge/chat/on%20mattermost/blue
-   :target: https://mattermost.brainhack.org/brainhack/channels/dmriprep
+    :target: https://mattermost.brainhack.org/brainhack/channels/dmriprep
 
 .. image:: https://img.shields.io/pypi/v/dmriprep.svg
-        :target: https://pypi.python.org/pypi/dmriprep
+    :target: https://pypi.python.org/pypi/dmriprep
 
 .. image:: https://circleci.com/gh/nipreps/dmriprep.svg?style=svg
     :target: https://circleci.com/gh/nipreps/dmriprep
 
 .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3392201.svg
-   :target: https://doi.org/10.5281/zenodo.3392201
+    :target: https://doi.org/10.5281/zenodo.3392201
 
 .. image:: https://readthedocs.org/projects/dmriprep/badge/?version=latest
-        :target: https://dmriprep.readthedocs.io/en/latest/?badge=latest
-        :alt: Documentation Status
+    :target: https://dmriprep.readthedocs.io/en/latest/?badge=latest
+    :alt: Documentation Status
 
 
 The preprocessing of diffusion MRI (dMRI) involves numerous steps to clean and standardize