add 'and simple'
add '& simple'
conflict fixed
add merge
merge with no-ff
default is using fast forward
fix one typo
fix bug 101
fix bug 101
new feature
fix conflict merge