modify conflict file