Resolved merge conflict

Author: schaffererin

articles/aks/concepts-clusters-workloads.md

@@ -407,35 +407,21 @@ The following namespaces are available when you create an AKS cluster:
 
 | Namespace | Description |  
 | ----------------- | ------------- |  
-<<<<<<< HEAD
-| *default* | Where pods and deployments are created by default when none is provided. In smaller environments, you can deploy applications directly into the default namespace without creating extra logical separations. When you interact with the Kubernetes API, such as with `kubectl get pods`, the default namespace is used when none is specified. |  
+| *default* | Where pods and deployments are created by default when none is provided. In smaller environments, you can deploy applications directly into the default namespace without creating additional logical separations. When you interact with the Kubernetes API, such as with `kubectl get pods`, the default namespace is used when none is specified.  |  
 | *kube-system* | Where core resources exist, such as network features like DNS and proxy, or the Kubernetes dashboard. You typically don't deploy your own applications into this namespace. |  
-| *kube-public* | Typically not used, but can be used for resources to be visible across the whole cluster, and can be viewed by any user. |  
-=======
-| *default*                                                                                 | Where pods and deployments are created by default when none is provided. In smaller environments, you can deploy applications directly into the default namespace without creating additional logical separations. When you interact with the Kubernetes API, such as with `kubectl get pods`, the default namespace is used when none is specified.                                                        |  
-| *kube-system* | Where core resources exist, such as network features like DNS and proxy, or the Kubernetes dashboard. You typically don't deploy your own applications into this namespace.                                      |  
-| *kube-public*                                                                            | Typically not used, but can be used for resources to be visible across the whole cluster, and can be viewed by any user.                                                                                    |  
->>>>>>> 6a2b163ea7390e337503b34354e9689e528f1b62
+| *kube-public* | Typically not used, you can use it for resources to be visible across the whole cluster, and can be viewed by any user. |  
 
 For more information, see [Kubernetes namespaces][kubernetes-namespaces].
 
 ## Next steps
 
 For more information on core Kubernetes and AKS concepts, see the following articles:
 
-<<<<<<< HEAD
-* [Kubernetes / AKS access and identity][aks-concepts-identity]
-* [Kubernetes / AKS security][aks-concepts-security]
-* [Kubernetes / AKS virtual networks][aks-concepts-network]
-* [Kubernetes / AKS storage][aks-concepts-storage]
-* [Kubernetes / AKS scale][aks-concepts-scale]
-=======
-- [AKS access and identity][aks-concepts-identity]
-- [AKS security][aks-concepts-security]
-- [AKS virtual networks][aks-concepts-network]
-- [AKS storage][aks-concepts-storage]
-- [AKS scale][aks-concepts-scale]
->>>>>>> 6a2b163ea7390e337503b34354e9689e528f1b62
+* [AKS access and identity][aks-concepts-identity]
+* [AKS security][aks-concepts-security]
+* [AKS virtual networks][aks-concepts-network]
+* [AKS storage][aks-concepts-storage]
+* [AKS scale][aks-concepts-scale]
 
 <!-- EXTERNAL LINKS -->
 [cluster-api-provider-azure]: https://github.com/kubernetes-sigs/cluster-api-provider-azure