remove conflict info