fix more merge error