fixed rebase issues