branch test
feature1
editing
conflict fixed
add merge
merge with no-ff
fix bug 101
merge bug fix 101