add conflict.txt
modify conflict.txt