remove some conflict indicators.