JetBrains resolves conflicts that git can’t IME. For example multiple branches modifying the same import lines in a Python file (most common merge conflict I see), JetBrains can resolve this.

I’d be interested to know how they solve it, I suspect they run some language-aware logic to do the merge on a given hunk.