Patch for rebase