Fix conflict

diff --cc lib/pleroma/web/endpoint.ex
index 0a2ac853e768948143b5bc702434ff3c9410b3a5,1703d5623f579395523a82b2a6dd905e62dbee30..fdf7fb72a09cab6eded0a5e370b097d9a8f4aa54
--- 1/lib/pleroma/web/endpoint.ex
--- 2/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@@ -11,14 -10,11 +11,14 @@@ defmodule Pleroma.Web.Endpoint d
    #
    # You should set gzip to true if you are running phoenix.digest
    # when deploying your static files in production.
 -  plug Plug.Static,
 -    at: "/media", from: "uploads", gzip: false
 -  plug Plug.Static,
 -    at: "/", from: :pleroma,
 +  plug(Plug.Static, at: "/media", from: "uploads", gzip: false)
 +
 +  plug(
 +    Plug.Static,
 +    at: "/",
 +    from: :pleroma,
-     only: ~w(index.html static finmoji emoji packs sounds images instance sw.js)
+     only: ~w(index.html static finmoji emoji packs sounds images instance sw.js favicon.png)
 +  )
  
    # Code reloading can be explicitly enabled under the
    # :code_reloader configuration of your endpoint.