ResolveConflictsFromString extension

on