fix more merge issues for 3.0.1