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.