Do you have merge conflicts? Don't worry! Use the magic wand to Resolve Simple Conflicts. With those out of the way, you can focus on resolving the rest.