Attempt to resolve merge conflict
[akkoma] / priv / static / emoji / 1f30b.svg
priv/static/emoji/1f30b.svg