branch test
AND simple
& simple
conflict fixed
add meerge
merge with no-ff
add 1.txt
remove 1.txt