branch test
and simple
& simple
conflict fixed
add merge
merge with no--ff
fix issue-101
merged bug fixed 101