Fix issues after rebase