Comment Comment by mschulze Right - actually, for conflicts I switch to IntelliJ. parent mschulze 7 months ago