branch test
AND simple
& simple
confilict fixed
3
add merge
merge with on-ff
delte test.txt