brance test
sencond branch
add simple
conflict fixed
add merge
merge with with no-ff
issue-101
merged bug fix 101
issue conflict
bug modify ok