fixing rebase problems