having problems rebasing