manual merge cleanup