Add conflict.txt