fix more merge bs