Shift modal

So you can point the base of this PR to that other PR, then it won't show those changes and once the other PR is merged, this will still be merged to master.  Make sense?