branch test
Add 'and simple'
Add '& simple'
conflict fixed
add merge
merge without no-ff
fix bug 101
merged bug fix 101