Correctly handle forward of remaining data on removal
Merge remote-tracking branch upstream/$:{upbranch}