After changing the conflict