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