re-apply a change that was missed during rebase