fix more merge errors