Attempt to resolve merge conflict
[akkoma] / priv / static / emoji / 1f939-1f3fc.svg
priv/static/emoji/1f939-1f3fc.svg