remove conflict indicator ...