branch test
modify test.txt
and simple
& simple
conflict fixed