Visual Studio Code Git Merge