Delete the conflict