resolve merge conflict

docs/source/algorithm.md

docs/source/conf.py

docs/source/documentation/pymf.md

docs/source/index.md

docs/source/mf_notes.md

pymf/__init__.py

pymf/kwant_helper/utils.py

pymf/mf.py

pymf/model.py

pymf/observables.py

pymf/params/param_transforms.py

pymf/params/rparams.py

pymf/solvers.py

pymf/tb/tb.py

pymf/tb/transforms.py

pymf/tb/utils.py

pymf/tests/test_graphene.py

pymf/tests/test_hat.py

pymf/tests/test_hubbard.py

pymf/tests/test_params.py