more merge cleanup