fixing rebase