Return and track affected and culprit on conflicts #1260

Job	Run time
Source code is formatted	7s
Documentation builds successfully	8s
No warnings from Clippy	24s
Tests pass	48s
	1m 27s

Provide feedback