diff --git a/_ideas/YYYY-MM-DD-new-blog-template.md b/_ideas/YYYY-MM-DD-new-blog-template.md
index 16073ae..604cf92 100644
--- a/_ideas/YYYY-MM-DD-new-blog-template.md
+++ b/_ideas/YYYY-MM-DD-new-blog-template.md
@@ -3,10 +3,6 @@ title: "Put Your Blog Title Here"
 permalink: "/blog-url"
 description: "Short description. Will be displayed when sharing blog post to Facebook."
 keywords: ""
-<<<<<<< HEAD
 image: "hello-world"
-=======
-image: "path-to-featured-image"
->>>>>>> 7f3ce1780d97836d3c4b07790ff9ea713a8463c4
 image-attrib: ""
 ---