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!

You can select which channels you’re interested in in Discord now (though maybe it’s not enabled by default for all servers yet?). I want to be able to see all those channels in a single place instead of clicking between servers but 🤷