modify conflict res doc