From 5f58f453cf671420373e3887d83a1d67bce6c37a Mon Sep 17 00:00:00 2001
From: Mark Bishop <37810556+MBishop17@users.noreply.github.com>
Date: Mon, 4 Jun 2018 12:34:18 -0700
Subject: [PATCH] Update _index.md

---
 content/rancher/v2.x/en/tasks/projects/_index.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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
+