fix more merge conflicts #3234