The three-way merging system for solving conflicts in SM could be improved in terms of visual clues of what is being merged from where (i.e. the left pane or the right one).
There are triangles at the beginning of the lines/blocks which can be merged/removed, but these don't change color to indicate is that line/block is currently being merged-into the central pane or not.
If the triangles could have a grey color to indicate that the line/block is not being used/merged, and a green color when it is, it would be much easier to track how multiple conflicts are being handled.
Today I had to handle three way merge with many conflicts and I had trouble spotting from which side the edits were being merged when revising the whole file.