more rebase issues