diff --git a/docs/admin/resourcequota/walkthrough.md b/docs/admin/resourcequota/walkthrough.md
index 4712f7f25a..7422f2abcf 100644
--- a/docs/admin/resourcequota/walkthrough.md
+++ b/docs/admin/resourcequota/walkthrough.md
@@ -129,7 +129,6 @@ $ kubectl get pods --namespace=quota-example
 ```
 
 What happened?  I have no pods!  Let's describe the deployment to get a view of what is happening.
-<<<<<<< HEAD
 
 ```shell
 $ kubectl describe deployment nginx --namespace=quota-example
@@ -364,4 +363,4 @@ Actions that consume node resources for cpu and memory can be subject to hard qu
 
 Any action that consumes those resources can be tweaked, or can pick up namespace level defaults to meet your end goal.
 
-Quota can be apportioned based on quality of service and anticipated permanence on a node in your cluster.
\ No newline at end of file
+Quota can be apportioned based on quality of service and anticipated permanence on a node in your cluster.