branch test
AND simple
&simple
conflict fixed
branch master add one line
branch feature1 add another line
conflict fixed
feature1 add one line
add a new file
Merge branch 'feature1'
add one line
add one line
merge with no-ff
issue-101 add one line
merge bug fix 001