When resolving merge conflicts in Intellij IDEA, there\'s an option to let the IDE resolve simple conflicts. A magic wand becomes active when such an operation is possible