miyes branch test
add feature1
simple
conflict fixed
add merge
merge with no-ff
bug-101
merged bug fix 101