add merge
commit with no-ff
I don't know what to log, it's just a test
Merge branch 'dev'
test for fast-forward merge