diff --git a/config/dev.exs b/config/dev.exs
index dbd597c..7f9122b 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -22,11 +22,7 @@ config :cesium_link, CesiumLinkWeb.Endpoint,
   http: [ip: {127, 0, 0, 1}, port: 4000],
   check_origin: false,
   code_reloader: true,
-<<<<<<< HEAD
   debug_errors: false,
-=======
-  debug_errors: true,
->>>>>>> d2c5d93 (feat: cesium.link 2.0 (#71))
   secret_key_base: "6u3rGnb0UXmh9e8TXewRiiEYUFNvzvvgHTrDY0EqxJq7t44sm8gVtVO9+7AfQtQV",
   watchers: [
     esbuild: {Esbuild, :install_and_run, [:cesium_link, ~w(--sourcemap=inline --watch)]},
diff --git a/lib/cesium_link_web/controllers/error_html.ex b/lib/cesium_link_web/controllers/error_html.ex
index c4d772c..38a2c08 100644
--- a/lib/cesium_link_web/controllers/error_html.ex
+++ b/lib/cesium_link_web/controllers/error_html.ex
@@ -13,11 +13,7 @@ defmodule CesiumLinkWeb.ErrorHTML do
   #   * lib/cesium_link_web/controllers/error_html/404.html.heex
   #   * lib/cesium_link_web/controllers/error_html/500.html.heex
   #
-<<<<<<< HEAD
   embed_templates "error_html/*"
-=======
-  # embed_templates "error_html/*"
->>>>>>> d2c5d93 (feat: cesium.link 2.0 (#71))
 
   # The default is to render a plain text page based on
   # the template name. For example, "404.html" becomes