add merge
merge with no-ff
branch test
Merge branch 'dev'
And simple
& simple
confict fixed
add merge
merge with no-off