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