Enhance the rebase / integration steps