2 ms·Right - actually, for conflicts I switch to IntelliJ.by mschulze 7mo agoRight - actually, for conflicts I switch to IntelliJ.