diff --git a/content/rancher/v2.x/en/tasks/projects/_index.md b/content/rancher/v2.x/en/tasks/projects/_index.md
index e8758f6fda9..bfa8bc07408 100644
--- a/content/rancher/v2.x/en/tasks/projects/_index.md
+++ b/content/rancher/v2.x/en/tasks/projects/_index.md
@@ -44,10 +44,8 @@ Coming Soon
 ## Launching a Catalog App
 
 Coming Soon
-<<<<<<< HEAD
-=======
 
 ## Creating a Pod Security Policy
 
 Coming Soon
->>>>>>> adding new files and headers
+