DeletedFilesFilter now resolves deletion conflicts.