post rebase fix