Build

Improve the handling of conflicting properties while merging schemas #1138

Job	Run time
check-style	13s
build-and-test (ubuntu-latest)	1m 45s
build-and-test (windows-latest)	4m 2s
build-and-test (macos-latest)	2m 35s
	8m 35s

Provide feedback