Manually resolve conflicts

.coveragerc

.gitlab-ci.yml

AUTHORS.md

CHANGELOG.md

bilby/core/prior/__init__.py

bilby/core/prior/analytical.py

bilby/core/prior/base.py

bilby/core/prior/conditional.py

bilby/core/prior/dict.py

bilby/core/prior/slabspike.py

bilby/core/result.py

bilby/core/sampler/__init__.py

bilby/core/sampler/base_sampler.py

bilby/core/sampler/cpnest.py

bilby/core/sampler/dnest4.py

bilby/core/sampler/dynesty.py

bilby/core/sampler/ptemcee.py

bilby/core/sampler/pymultinest.py

bilby/core/sampler/ultranest.py

bilby/core/utils.py