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