Remove the conflict indicators