modify a.txt
conflict fixed