Making the switch to diff3 revolutionized working with conflicts for me. This is a cool tool thanks for making and posting it.