unexpected merge cleanup