resolve merge conflicts

CITATION.cff

README.md

analysis/demand-metric-plot.ipynb

analysis/demand-metric.ipynb

analysis/src/demand.py

codemeta.json

docs/README.md

docs/index.yaml

docs/release-process.md

execution/.gitignore

helm/Chart.yaml

helm/README.md

helm/crds/benchmark.yaml

helm/crds/execution.yaml

helm/preconfigs/minimal.yaml

helm/preconfigs/one-broker-values.yaml

helm/templates/grafana/dashboard-config-map.yaml

helm/templates/grafana/osp-dashboard-config-map.yaml

helm/templates/theodolite/crd-benchmark.yaml

helm/templates/theodolite/crd-execution.yaml