change to conflic