update the conflict