branch test
AND simple
& simple
conflict fixed
modify
merge with no-ff
test fast-forward merge
Merge branch 'dev'
test fast-merge
fixed issue-101