diff --git a/lib/pleroma/web/fallback/redirect_controller.ex b/lib/pleroma/web/fallback/redirect_controller.ex
index d556ae88e..4a0885fab 100644
--- a/lib/pleroma/web/fallback/redirect_controller.ex
+++ b/lib/pleroma/web/fallback/redirect_controller.ex
@@ -32,22 +32,6 @@ defmodule Pleroma.Web.Fallback.RedirectController do
   def redirector(conn, _params, code \\ 200) do
     {:ok, index_content} = File.read(index_file_path())
 
-<<<<<<< HEAD
-    title = "<title>#{Pleroma.Config.get([:instance, :name])}</title>"
-    favicon = "<link rel='icon' href='#{Pleroma.Config.get([:instance, :favicon])}'>"
-    manifest = "<link rel='manifest' href='/manifest.json'>"
-
-    response =
-      index_content
-      |> String.replace(
-        "<!--server-generated-meta-->",
-        title <> favicon <> manifest
-      )
-
-    conn
-    |> put_resp_content_type("text/html")
-    |> send_resp(200, response)
-=======
     response =
       index_content
       |> add_generated_metadata()
@@ -55,7 +39,6 @@ defmodule Pleroma.Web.Fallback.RedirectController do
     conn
     |> put_resp_content_type("text/html")
     |> send_resp(code, response)
->>>>>>> origin/develop
   end
 
   def redirector_with_meta(conn, %{"maybe_nickname_or_id" => maybe_nickname_or_id} = params) do
@@ -71,23 +54,10 @@ defmodule Pleroma.Web.Fallback.RedirectController do
     {:ok, index_content} = File.read(index_file_path())
     tags = build_tags(conn, params)
     preloads = preload_data(conn, params)
-<<<<<<< HEAD
-    title = "<title>#{Pleroma.Config.get([:instance, :name])}</title>"
-    favicon = "<link rel='icon' href='#{Pleroma.Config.get([:instance, :favicon])}'>"
-    manifest = "<link rel='manifest' href='/manifest.json'>"
-
-    response =
-      index_content
-      |> String.replace(
-        "<!--server-generated-meta-->",
-        tags <> preloads <> title <> favicon <> manifest
-      )
-=======
 
     response =
       index_content
       |> add_generated_metadata(tags <> preloads)
->>>>>>> origin/develop
 
     conn
     |> put_resp_content_type("text/html")
@@ -101,20 +71,10 @@ defmodule Pleroma.Web.Fallback.RedirectController do
   def redirector_with_preload(conn, params) do
     {:ok, index_content} = File.read(index_file_path())
     preloads = preload_data(conn, params)
-<<<<<<< HEAD
-    title = "<title>#{Pleroma.Config.get([:instance, :name])}</title>"
-    favicon = "<link rel='icon' href='#{Pleroma.Config.get([:instance, :favicon])}'>"
-    manifest = "<link rel='manifest' href='/manifest.json'>"
-
-    response =
-      index_content
-      |> String.replace("<!--server-generated-meta-->", preloads <> title <> favicon <> manifest)
-=======
 
     response =
       index_content
       |> add_generated_metadata(preloads)
->>>>>>> origin/develop
 
     conn
     |> put_resp_content_type("text/html")