Merge to take into account slashes in filenames