branch test
AND simple
& simple
conflict fixed
add merge
delete add merge
merge with no-ff
add a line
Merge branch 'dev'