Ellié Computing Merge offers a number of tools to solve conflicts. Those tools are quite similar in File and Folder Comparisons.
to navigate between conflicts.
to solve the conflict by using the left, right or ancestor item.
solve the conflict by using data from both left and right
to solve conflicts in Folder Comparisons.
to unresolve the conflict
You can also use commands available in the contextual menu
or the fly by toolbar. They will be applied on conflicts
contained (even partially) in the current selection.