When merging from another branch there are sometimes a lot of merge conflicts because of versions being changed in both branches. Instead of resolving those merge conflicts manually, there's now a utility that resolves them for you. It can be accessed by selecting "Auto Resolve Versions..." from the merge menu.
In the dialog that opens you can select which versions to use (ours, theirs or highest version) and also manually exclude files when needed.
If a file has other conflicts than different versions they cannot be automatically resolved by the tool, and in that case the Message on that row will indicate that there are other conflicts in the file.