add conflict.txt