modify the conflict