fix(build): fix rebase errors #8637

Job	Run time
test-path-length	12s
build (ubuntu-20.04, 3.9.9, minimal)	5m 34s
build (ubuntu-20.04, 3.9.9, maximal)	5m 19s
build (ubuntu-20.04, 3.10.6, minimal)	5m 28s
build (ubuntu-20.04, 3.10.6, maximal)	5m 22s
test-python (ubuntu-20.04, 3.9.9, minimal)	15s
lint-files (maximal)	33s
test-api (maximal)	32s
test-python (ubuntu-20.04, 3.9.9, maximal)	14m 57s
test-yaml (10, 0, minimal)	34s
test-python (ubuntu-20.04, 3.10.6, minimal)	14m 42s
test-yaml (10, 0, maximal)	40s
test-python (ubuntu-20.04, 3.10.6, maximal)	14m 58s
test-yaml (10, 1, minimal)	35s
test-yaml (10, 1, maximal)	40s
test-yaml (10, 2, minimal)	34s
test-yaml (10, 2, maximal)	33s
test-yaml (10, 3, minimal)	2m 46s
test-yaml (10, 3, maximal)	2m 57s
test-yaml (10, 4, minimal)	25s
test-yaml (10, 4, maximal)	29s
test-yaml (10, 5, minimal)	2m 1s
test-yaml (10, 5, maximal)	2m 24s
test-yaml (10, 6, minimal)	30s
test-yaml (10, 6, maximal)	33s
test-yaml (10, 7, minimal)	31s
test-yaml (10, 7, maximal)	36s
test-yaml (10, 8, minimal)	28s
test-yaml (10, 8, maximal)	30s
test-yaml (10, 9, minimal)	36s
test-yaml (10, 9, maximal)	38s
check-version-and-changelog	0s
check-for-functional-changes	0s
build-conda	0s
deploy	0s
test-on-windows	0s
publish-to-conda	0s
	1h 26m 52s

Provide feedback