conflict changed