branch test
AND simple
& simple
conflict fixed
add merge
merge with no-ff
another commit
commit another
merge to dev1 with no--ff
Merge branch 'dev1'
fix bug 101
merged bug fix 101