change test1.txt from a
solve conflict test1