conflict.txt added