fix more merge hickups