What is the best approach to resolving merge conflicts?

Merge conflicts can be a big pain in the ass. Are there any tools/techniques that you have used to resolve them more efficiently?