Path adjustments after rebase