fix more bad merges