fixes #7914

fixes #7906

fix : Standalone Monaco text edit validation

docs(vscode.d.ts): fix typo ("a a" --> "a")

move conflict resolution into the message (this is a workaround because we do not show primary actions when tabs are enabled)

fixes #7845