First commit
Second commit
Merge branch 'dev'