Merge branch 'master', remote-tracking branch 'upstream/master'
rebase
Merge branch 'master', remote-tracking branch 'myfork/master'