modify test.txt
modify test.txt
AND simple
& simple
conflict fixed