merge cleanup?