fix more merge issues