Attempt to resolve merge conflict
[akkoma] / priv / static / emoji / 31-20e3.svg
priv/static/emoji/31-20e3.svg