remove conflict message.