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

ommit message to explain why this merge is necessary,
fast merge
Merge branch 'dev'
test
test
test