first commit to dev branch
second commit
Merge branch 'dev'