VSCode releases new 3-way merge editor as default. Bad move
github.com