add merge
merge with no ff
-no-ff
Merge branch 'dev'
Meger with dev