Visual Studio Code 1.71 is out with merge editor improvements and more