Function resolveFileNameConfictsIMI

Returns { added: string[]; conflictHashes: string[] }