CBG-4806: move conflict detection to common function #14957

Job	Run time
build	1m 19s
lint	1m 40s
addlicense	14s
test (macos)	4m 29s
test-default-collection	4m 48s
test-sgcollect (ubuntu-latest)	27s
test (windows)	4m 32s
test-race	5m 58s
test (ubuntu)	5m 17s
test-stats-definition-exporter (ubuntu-latest)	1m 17s
test-stats-definition-exporter (windows-latest)	1m 10s
test-stats-definition-exporter (macos-latest)	31s
test-sgcollect (macos-latest)	55s
python-format	14s
python-lint	14s
build cache perf tool	1m 14s
test-sgcollect (windows-latest)	3m 21s
	37m 40s

Provide feedback