Merge branch 'master' into ref/modularize-multifile-renamers

Author: tsalo

CHANGELOG.md

@@ -353,14 +353,18 @@ TODO Summary
 [#404]: https://github.com/nipy/heudiconv/issues/404
 [#407]: https://github.com/nipy/heudiconv/issues/407
 [#419]: https://github.com/nipy/heudiconv/issues/419
-<<<<<<< HEAD
 [#420]: https://github.com/nipy/heudiconv/issues/420
 [#425]: https://github.com/nipy/heudiconv/issues/425
 [#430]: https://github.com/nipy/heudiconv/issues/430
 [#432]: https://github.com/nipy/heudiconv/issues/432
 [#434]: https://github.com/nipy/heudiconv/issues/434
 [#436]: https://github.com/nipy/heudiconv/issues/436
 [#437]: https://github.com/nipy/heudiconv/issues/437
-=======
 [#425]: https://github.com/nipy/heudiconv/issues/425
->>>>>>> origin/ref/modularize-multifile-renamers
+[#420]: https://github.com/nipy/heudiconv/issues/420
+[#425]: https://github.com/nipy/heudiconv/issues/425
+[#430]: https://github.com/nipy/heudiconv/issues/430
+[#432]: https://github.com/nipy/heudiconv/issues/432
+[#434]: https://github.com/nipy/heudiconv/issues/434
+[#436]: https://github.com/nipy/heudiconv/issues/436
+[#437]: https://github.com/nipy/heudiconv/issues/437