branch test
AND simple
& simple
conflict fixed
add a new line
merge with no-ff
add hello
add master tag
process conflict
fix bug 101
merge bug fix 101