commit 2
commit 3
Merge branch 'master' into my_new_branch