Fix post rebase