Fixes incorrect merge conflict resolution.  Changes the selection from dot to border outline.