2 ms·Amen. I also have Kaleidoscope which is great for diffs but nothing beats Resolve Conflicts from JetBrains.by user3939382 5y agoAmen. I also have Kaleidoscope which is great for diffs but nothing beats Resolve Conflicts from JetBrains.