ParentFull threadnanagojo·The merge conflict tool in Intellij should really be a product on its own. It's the best IMOView on HN