commit 2
commit 3
commit 5
Merge remote-tracking branch 'origin/master'