branch test
 Add 'and simple'
 Add '& simple'
conflict fixed
add merge
merge with no-ff
fix bug 101
merged bug fix 101
fix bug and do test about fix_bug
fix bug and do test about fix_bug