Easily choose one version of a conflicted file or merge both versions using a merge tool of your choice.