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