stringio diffs
conflict merged