fix more conflicts