fix more conflicts from merge