fixing rebase issues