I'm using VS 2019and I got merge conflicts which had to be resolved manually. The problem is that the button for “Merge changes in merge tool” at the top of the VS editor - is not shown.
I've seen this issue happened since 2019 and it seems that it still doesn't fix completely...