remove conflict indicators