remove conflict indicator