Super excited by a three-way merge tool, it's the thing I find most lacking in Atom and one of the great things about IntelliJ.