diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index a6ad15aad..000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-<<<<<<< HEAD   (833046 Merge "Add publish date to HTML output" into r/stx.5.0)
-    "restructuredtext.languageServer.disabled": true,
-    "restructuredtext.preview.sphinx.disabled": true,
-    "restructuredtext.linter.disabled": true
-=======
-    "restructuredtext.linter.disabled": true,
-    "restructuredtext.preview.sphinx.disabled": true,
-    "restructuredtext.languageServer.disabled": true
->>>>>>> CHANGE (569fd3 New content for Metrics Server tutorials (user and admin))
-}
\ No newline at end of file
diff --git a/doc/source/security/kubernetes/security-install-kubectl-and-helm-clients-directly-on-a-host.rst b/doc/source/security/kubernetes/security-install-kubectl-and-helm-clients-directly-on-a-host.rst
index 0eb5e0939..360c87a81 100644
--- a/doc/source/security/kubernetes/security-install-kubectl-and-helm-clients-directly-on-a-host.rst
+++ b/doc/source/security/kubernetes/security-install-kubectl-and-helm-clients-directly-on-a-host.rst
@@ -86,9 +86,9 @@ configuration is required in order to use :command:`helm`.
         .. note::
             In order for your remote host to trust the certificate used by
             the |prod-long| K8S API, you must ensure that the
-            **k8s\_root\_ca\_cert** specified at install time is a trusted
-            CA certificate by your host. Follow the instructions for adding
-            a trusted CA certificate for the operating system distribution
+            ``k8s\_root\_ca\_cert`` specified at install time is a trusted
+            |CA| certificate by your host. Follow the instructions for adding
+            a trusted |CA| certificate for the operating system distribution
             of your particular host.
 
             If you did not specify a **k8s\_root\_ca\_cert** at install
@@ -109,7 +109,9 @@ configuration is required in order to use :command:`helm`.
             --user admin-user@mycluster --namespace=default
             % kubectl config use-context admin-user@mycluster
 
-        <$TOKEN\_DATA> is the token retrieved in step 1.
+
+        ``$TOKEN_DATA`` is the token retrieved in step 1.
+
 
     #.  Test remote :command:`kubectl` access.