Resolve merge conflict

diff --cc lib/pleroma/object.ex
index 99c836309a9f7e7bfb71480e644962b0f63a9866,e2b64872785dfca64084526243028e235951d97d..9a6c256df724a08e1111a10219b43bc5db1ad7ca
--- 1/lib/pleroma/object.ex
--- 2/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@@ -4,7 -4,7 +4,8 @@@
  
  defmodule Pleroma.Object do
    use Ecto.Schema
-   alias Pleroma.{Repo, Object, User, Activity, HTML}
++  alias Pleroma.{Repo, Object, User, Activity, HTML, ObjectTombstone}
+   alias Pleroma.{Repo, Object, User, Activity, ObjectTombstone}
    import Ecto.{Query, Changeset}
  
    schema "objects" do

diff --cc lib/pleroma/user.ex
Simple merge