Refactor strings working

Trying out returning a string for non_conflicts.  changed tests accordingly.