branch test
And SIMPLE
aaa
conflict fixed
add merge
merge with no-ff
fix bug merge
readme.txt issue-101
Merge branch 'issue-101'