Attempt to resolve merge conflict
[akkoma] / priv / static / emoji / 1f1fd.svg
priv/static/emoji/1f1fd.svg