Fix merge conflicts
Fix merge conflicts

eamodio/vscode,eamodio/vscode,eamodio/vscode,Microsoft/vscode,eamodio/vscode,eamodio/vscode,Microsoft/vscode,eamodio/vscode,eamodio/vscode,Microsoft/vscode,eamodio/vscode,eamodio/vscode,eamodio/vscode,microsoft/vscode,Microsoft/vscode,Microsoft/vscode,Microsoft/vscode,microsoft/vscode,microsoft/vscode,microsoft/vscode,microsoft/vscode,microsoft/vscode,eamodio/vscode,eamodio/vscode,eamodio/vscode,microsoft/vscode,microsoft/vscode,microsoft/vscode,microsoft/vscode,Microsoft/vscode,Microsoft/vscode,eamodio/vscode,microsoft/vscode,Microsoft/vscode,Microsoft/vscode,Microsoft/vscode,microsoft/vscode,microsoft/vscode,eamodio/vscode,microsoft/vscode,Microsoft/vscode,eamodio/vscode,Microsoft/vscode,microsoft/vscode,Microsoft/vscode,microsoft/vscode,microsoft/vscode,Microsoft/vscode,eamodio/vscode,Microsoft/vscode,Microsoft/vscode