fix merge conflict #480

Job	Run time
build (windows-2019, 3.8, x86)	1m 50s
build (windows-2019, 3.8, x64)	1m 50s
build (windows-2019, 3.9, x86)	1m 48s
build (windows-2019, 3.9, x64)	1m 47s
build (windows-2019, 3.10, x86)	1m 49s
build (windows-2019, 3.10, x64)	1m 49s
build (windows-2019, 3.11, x86)	1m 48s
build (windows-2019, 3.11, x64)	1m 57s
build (windows-2019, 3.12, x86)	1m 48s
build (windows-2019, 3.12, x64)	1m 50s
build (ubuntu-20.04, 3.8, x64)	2m 4s
build (ubuntu-20.04, 3.9, x64)	2m 5s
build (ubuntu-20.04, 3.10, x64)	2m 1s
build (ubuntu-20.04, 3.11, x64)	2m 4s
build (ubuntu-20.04, 3.12, x64)	2m 2s
build (macos-12, 3.8, x64)	2m 13s
build (macos-12, 3.9, x64)	2m 12s
build (macos-12, 3.10, x64)	2m 7s
build (macos-12, 3.11, x64)	2m 14s
build (macos-12, 3.12, x64)	2m 23s
package	1s
add-test-result-status-badges	1s
upload	1s
	39m 44s

Provide feedback