chnage the conflict