Fix conflict stuff #44

Job	Run time
build-linux	6m 26s
build-platform (ubuntu-24.04-arm)	1s
build-platform (windows-latest)	10m 44s
build-platform (macos-13)	13m 9s
build-platform (macos-14)	4m 11s
	34m 31s

Provide feedback