fix more rebase errors