here goes ...
Merge remote-tracking branch 'upstream/master'

trying this