Merge pull request #436 from holly-cummins/fix-syncbot-conflict-handling #795

Job	Run time
ci-gate	2s
Script unit tests	4s
[jvm-build-test-java21]: springboot4	4m 13s
[jvm-build-test-java21]: quarkus3-virtual	4m 56s
[jvm-build-test-java21]: springboot4-virtual	3m 58s
[jvm-build-test-java21]: quarkus3	4m 46s
[jvm-build-test-java21]: springboot3-virtual	4m 9s
[jvm-build-test-java25]: springboot4	3m 54s
[jvm-build-test-java21]: springboot3	6m 24s
[jvm-build-test-java25]: springboot3-virtual-leyden	4m 19s
[jvm-build-test-java25]: springboot3	4m 2s
[jvm-build-test-java25]: quarkus3-virtual	4m 56s
[jvm-build-test-java21]: quarkus3-spring-compatibility	5m 12s
[jvm-build-test-java25]: springboot3-virtual	6m 18s
[jvm-build-test-java25]: springboot4-virtual	4m 2s
[jvm-build-test-java25]: springboot4-virtual-leyden	4m 20s
[jvm-build-test-java25]: quarkus3-leyden	5m 11s
[jvm-build-test-java25]: springboot4-leyden	4m 34s
[jvm-build-test-java25]: quarkus3	5m 1s
[jvm-build-test-java25]: quarkus3-spring-compatibility	5m 1s
[jvm-build-test-java25]: quarkus3-virtual-leyden	5m 16s
[jvm-build-test-java25]: springboot3-leyden	4m 29s
	1h 35m 7s

Provide feedback