Fixup accidental push of stash merge