fix more merge conflicts