diff --git a/lib/mix/tasks/pleroma/activity.ex b/lib/mix/tasks/pleroma/activity.ex
new file mode 100644
index 000000000..e03966e18
--- /dev/null
+++ b/lib/mix/tasks/pleroma/activity.ex
@@ -0,0 +1,23 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Mix.Tasks.Pleroma.Activity do
+  alias Pleroma.Activity
+  require Logger
+  import Mix.Pleroma
+  use Mix.Task
+
+  @shortdoc "A collection of activity debug tasks"
+  @moduledoc """
+   A collection of activity related tasks
+
+   mix pleroma.activity get <id>
+  """
+  def run(["get", id | _rest]) do
+    start_pleroma()
+    id
+    |> Activity.get_by_id()
+    |> IO.inspect()
+  end
+end
diff --git a/priv/static/index.html b/priv/static/index.html
index 6e84ec3da..e58c4380b 100644
--- a/priv/static/index.html
+++ b/priv/static/index.html
@@ -1,5 +1 @@
-<<<<<<< HEAD
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/vendors~app.b2603a50868c68a1c192.css rel=stylesheet><link href=/static/css/app.db80066bde2c96ea6198.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/vendors~app.cbdd21d99d833ebc5bc3.js></script><script type=text/javascript src=/static/js/app.bdfdd2587a912fd689b3.js></script></body></html>
-=======
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/vendors~app.b2603a50868c68a1c192.css rel=stylesheet><link href=/static/css/app.db80066bde2c96ea6198.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/vendors~app.4b7be53256fba5c365c9.js></script><script type=text/javascript src=/static/js/app.670c36c0acc42fadb4fe.js></script></body></html>
->>>>>>> 456668b490e9ee47cf773a8563a9f3a3765ce348
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/vendors~app.b2603a50868c68a1c192.css rel=stylesheet><link href=/static/css/app.db80066bde2c96ea6198.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/vendors~app.4b7be53256fba5c365c9.js></script><script type=text/javascript src=/static/js/app.670c36c0acc42fadb4fe.js></script></body></html>
\ No newline at end of file
diff --git a/priv/static/sw-pleroma.js b/priv/static/sw-pleroma.js
index d90d692de..3851dc49f 100644
Binary files a/priv/static/sw-pleroma.js and b/priv/static/sw-pleroma.js differ
