fix more rebase conflicts