Refactor strings working

Hmm, would it be hard for merging to do something like this instead?

    result = merge_text(...)
    if result.length != 1 || result[:type] != non_conflict
      .. conflict
    else
      .. non conflict
    end