fix more merge fuckups