diff --git a/.vscode/settings.json b/.vscode/settings.json
index a48a5e9b3..4c665beca 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,11 @@
 {
+<<<<<<< HEAD
     "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
+>>>>>>> 2298678... New content for Metrics Server tutorials (user and admin)
 }
\ No newline at end of file
diff --git a/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-metrics-server.rst b/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-metrics-server.rst
index 24121e313..560e0ed16 100644
--- a/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-metrics-server.rst
+++ b/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-metrics-server.rst
@@ -38,6 +38,12 @@ deployment based on the load. Please refer to the official example
 <https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/>`__
 to create a PHP application which scales horizontally.
 
+.. rubric:: |prereq|
+
+You must have uploaded and applied the metrics system application described in
+:ref:`Install Metrics Server <kubernetes-admin-tutorials-metrics-server>`
+before proceeding.
+
 .. rubric:: |proc|
 
 After application deployment has completed, you can create a horizontal pod