Don't need to do the stash/unstash dance, just use diff-index
Merge remote-tracking branch 'upstream/master'