branch test
AND simple
& simple
conflict fixed
aaa
bbb
conflict2 fixed
dev
dev1
merge with no-ff
add test.txt
rm test.txt
fix bug 101
merged bug fix 101
add WIP