Revise the way that merge conflicts are reported