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

no conflicts
Merge remote-tracking branch 'upstream/master'

No conflicts - we are working on different files