modify conflict