edit test.txt
fix conflict test.txt