Most of the time when a merge conflict occurs, sourcetree automatically stages the files that still contain the merge metadata (i.e. it wants me to commit broken files).

It shows these files as being modified. Some files do have the "conflict" icon but are still automatically staged and NOT resolved.
If I unstage these files, they are still only "modified". I have to first find all of them (from possibly hundreds of files), then unstage them one by one and then restart the merge for them.

We have had it happen more than once now, that unresolved conflicts were simply committed to the repository. This breaks A LOT of things!