... fix more merge artifacts?