branch test
AND simple
& simple
conflict fixed
modify gitusage.txt
modify readme.txt
merge with no-ff
fix bug 101
merged bug fix 101
aaaaaa
conflict fix