Merge "selectConflictingRow iterates through unique fields"