Merge cleanup