index: replace has_conflicts by conflicts returning None
Testing a docstring formating that's nice with pydoc
Get ready for 0.21.1 release
Update list of authors