Correct the identification of the conflict.