resolving conflicts

content/en/docs/tasks/administer-cluster/namespaces-walkthrough.md

@@ -3,10 +3,10 @@ reviewers:
 - derekwaynecarr
 - janetkuo
 title: Namespaces Walkthrough
-content_template: templates/task
+content_type: task
 ---
 
-{{% capture overview %}}
+<!-- overview -->
 Kubernetes {{< glossary_tooltip text="namespaces" term_id="namespace" >}}
 help different projects, teams, or customers to share a Kubernetes cluster.
 
@@ -19,16 +19,17 @@ Use of multiple namespaces is optional.
 
 This example demonstrates how to use Kubernetes namespaces to subdivide your cluster.
 
-{{% /capture %}}
 
 
-{{% capture prerequisites %}}
+
+## {{% heading "prerequisites" %}}
+
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
-{{% /capture %}}
 
-{{% capture steps %}}
+
+<!-- steps -->
 
 ## Prerequisites
 
@@ -242,7 +243,7 @@ snowflake    2/2     2            2           2m
 ```
 
 ```shell
-kubectl get pods -l run=snowflake
+kubectl get pods -l app=snowflake
 ```
 ```
 NAME                         READY     STATUS    RESTARTS   AGE
@@ -278,7 +279,7 @@ cattle       5/5     5            5           10s
 ```
 
 ```shell
-kubectl get pods -l run=cattle
+kubectl get pods -l app=cattle
 ```
 ```
 NAME                      READY     STATUS    RESTARTS   AGE
@@ -294,4 +295,4 @@ At this point, it should be clear that the resources users create in one namespa
 As the policy support in Kubernetes evolves, we will extend this scenario to show how you can provide different
 authorization rules for each namespace.
 
-{{% /capture %}}
+