first commit
second commit
Merge remote-tracking branch 'upstream/master'