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