fixing conflict merge issues #129

Job	Run time
(Allowed Failure) Python 3.11 with dev version of key dependencies	2m 50s
Python 3.9.xx with minimal dependencies	2m 5s
Python 3.9.xx with all optional dependencies	1m 53s
Python 3.9.xx with numpy 1.24 and full coverage	1m 43s
Python 3.10.xx with minimal dependencies	2m 19s
Python 3.10.xx with all optional dependencies	2m 0s
Python 3.10.xx with numpy 1.24 and full coverage	3m 20s
Python 3.10.xx with numpy 2.10 and full coverage	2m 40s
Python 3.11.xx with minimal dependencies	2m 32s
Python 3.11.xx with all optional dependencies	2m 50s
Python 3.11.xx with numpy 1.24 and full coverage	2m 35s
Python 3.11.xx with numpy 2.10 and full coverage	2m 32s
Python 3.12.xx with minimal dependencies	2m 41s
Python 3.12.xx with all optional dependencies	2m 59s
Python 3.12.xx with numpy 2.10 and full coverage	2m 55s
	37m 54s

Provide feedback