Create conflict.merge.txt