Merge cleanup.