merge cleanup