fix more merge issue