4 ms·As I mostly work on Java projects, the one built into Idea/Android Studio is a good one for merge conflicts.by grishka 5y agoAs I mostly work on Java projects, the one built into Idea/Android Studio is a good one for merge conflicts.