conflict fixed #390

Job	Run time
Lint	0s
matrix.name	0s
Linux i386 debian_32bit	0s
Linux x86-64 pylatest_free_threaded	0s
Linux x86-64 pylatest_pip_scipy_dev	0s
Retrieve the latest commit message	-8s
Retrieve the selected tests	-9s
	-17s

Provide feedback