branch test
AND simple
& simple
conflict fixed
add merge
merge with no-ff
remove hello
Merge branch 'dev'
add hello
Merge branch 'dev'
fix bug 101
merged bug fix 101