merge cleanup.