Use the conflict solver to visually solve conflicts in conflict files. If you haven't choosen to use an external merge tool at Edit|Preferences, the Conflict Solver window opens:
With the left two tool bar buttons you can navigate from conflict to conflict. The right two tool bar buttons allow to take either the left or right solution of the conflict. If necessary, you can also edit directly in the resulting document at the bottom. To save the changes, click the middle tool bar button.