Resolve conflict

.gitlab-ci.yml

CITATION.cff

buildimages/docker-compose-jq/Dockerfile

codemeta.json

docs/README.md

docs/api-reference/crds.md

docs/api-reference/patchers.md

docs/creating-a-benchmark.md

docs/index.yaml

docs/running-benchmarks.md

docs/theodolite-benchmarks/index.md

docs/theodolite-benchmarks/load-generator.md

execution/theodolite.yaml

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

helm/templates/theodolite/theodolite-operator.yaml

slo-checker/dropped-records/Dockerfile

slo-checker/dropped-records/requirements.txt

slo-checker/generic/Dockerfile

slo-checker/generic/requirements.txt

slo-checker/record-lag/Dockerfile