first commit
third try commit
Merge remote-tracking branch 'upstream/master'

because I am trying to learn!
I'm not sure