merge cleanup fix