1st commit dev'
2nd commit dev
Merge branch 'dev'