Added conflict resolving for duplicate file names.