upvote
Right - actually, for conflicts I switch to IntelliJ.
reply