and simple
add readme
modify conflict
merge no ff strategy
merge with no-ff
merge with ff strategy
fix bug 1001