File cleanup after merges