branch test
AND simple
& simple
conflict fixed
add merge 123
merge with no-ff
try
Merge branch 'dev'
fix bug 101
merged bug fix 101
commit sth
Merge branch 'dev'
add feature vulcan