ADD simple
& simple
conflict fixed
add merge
merge with no-ff
fix bug 10
merge bug fix 10
fix conflict
add new_feature
merge new_feature