diff --git a/src/templates/api_reference/resource.ejs b/src/templates/api_reference/resource.ejs
index 0a47a95..9b10c94 100644
--- a/src/templates/api_reference/resource.ejs
+++ b/src/templates/api_reference/resource.ejs
@@ -11,15 +11,9 @@ familiarize yourself with the process as documented in the README.md found in th
 
 parent-title: API Reference
 title: <%= thisType %>
-<<<<<<< HEAD
 description: "Get documentation, references, and support for working with Asana <%= thisType %>"
 _template: dev-page
 _layout: default
-=======
-description:
-_template: dev-api-reference
-_layout: dev
->>>>>>> parent of 7c622ca... Modifications to align with generated Markdown file structure and new template that the static site team implemented
 
 
 # Sidebar nav