diff --git a/lib/jol/blog.ex b/lib/jol/blog.ex
index 63deb8a..00fe00e 100644
--- a/lib/jol/blog.ex
+++ b/lib/jol/blog.ex
@@ -1,18 +1,16 @@
 defmodule JOL.Blog do
-<<<<<<< HEAD
   alias JOL.Blog.Post
   alias JOL.Blog.Parser
-=======
+
   defmodule NotFoundError do
     defexception [:message, plug_status: 404]
   end
->>>>>>> 77c7828 (Add controllers/templates to show blog posts.)
 
   use NimblePublisher,
     build: JOL.Blog.Post,
     from: Application.app_dir(:jol, "priv/posts/**/*.md"),
     parser: Parser,
-    as: :posts,
+    as: :posts
 
   @posts Enum.sort_by(@posts, & &1.date, {:desc, Date})
   @tags @posts |> Enum.flat_map(& &1.tags) |> Enum.uniq() |> Enum.sort()