post rebase issues fixed