RedSpaceOps: file name conflict resolution

File name conflict resolution