changed conflict description and remove alert