modify conflict..