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
+# 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
+ """
+ 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
-Pleroma
-=======
-Pleroma
->>>>>>> 456668b490e9ee47cf773a8563a9f3a3765ce348
+Pleroma
\ No newline at end of file
diff --git a/priv/static/sw-pleroma.js b/priv/static/sw-pleroma.js
index d90d692de..3851dc49f 100644
--- a/priv/static/sw-pleroma.js
+++ b/priv/static/sw-pleroma.js
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-var serviceWorkerOption = {"assets":["/static/img/nsfw.74818f9.png","/static/css/app.db80066bde2c96ea6198.css","/static/js/app.bdfdd2587a912fd689b3.js","/static/css/vendors~app.b2603a50868c68a1c192.css","/static/js/vendors~app.cbdd21d99d833ebc5bc3.js"]};
-=======
var serviceWorkerOption = {"assets":["/static/img/nsfw.74818f9.png","/static/css/app.db80066bde2c96ea6198.css","/static/js/app.670c36c0acc42fadb4fe.js","/static/css/vendors~app.b2603a50868c68a1c192.css","/static/js/vendors~app.4b7be53256fba5c365c9.js"]};
->>>>>>> 456668b490e9ee47cf773a8563a9f3a3765ce348
!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/",t(t.s=0)}([function(e,n,t){"use strict";var r,o=t(1),i=(r=o)&&r.__esModule?r:{default:r};function a(){return clients.matchAll({includeUncontrolled:!0}).then(function(e){return e.filter(function(e){return"window"===e.type})})}self.addEventListener("push",function(e){e.data&&e.waitUntil(i.default.getItem("vuex-lz").then(function(e){return e.config.webPushNotifications}).then(function(n){return n&&a().then(function(n){var t=e.data.json();if(0===n.length)return self.registration.showNotification(t.title,t)})}))}),self.addEventListener("notificationclick",function(e){e.notification.close(),e.waitUntil(a().then(function(e){for(var n=0;n