The IntelliJ merge UI is the only way I ever want to deal with merge conflicts. So much better than any of the alternatives I’ve tried!