extra merge cleanup