fixing merge conflicts

.gitlab-ci.yml

bob/devtools/bootstrap.py

bob/devtools/build.py

bob/devtools/data/conda_build_config.yaml

bob/devtools/data/gitlab-ci/base-build.yaml

bob/devtools/data/gitlab-ci/docs.yaml

bob/devtools/data/gitlab-ci/nightlies.yaml

bob/devtools/data/gitlab-ci/single-package.yaml

bob/devtools/mirror.py

bob/devtools/pipelines.py

bob/devtools/scripts/build.py

bob/devtools/scripts/mirror.py

bob/devtools/scripts/pipelines.py

bob/devtools/templates/conda/meta.yaml

bob/devtools/templates/requirements.txt

conda/meta.yaml

doc/api.rst

doc/development.rst

doc/linux.rst

doc/templates.rst