Use VSCode for this. Also has three-way merge.