Attempt to resolve merge conflict
[akkoma] / priv / static / emoji / 21aa.svg
priv/static/emoji/21aa.svg