Best merge conflict ever:
<<<<<<< HEAD
=======>>>>>>> main
Totally see why git couldn't work this one out!
Computer Fairies is a Mastodon instance that aims to be as queer, friendly and furry as possible. We welcome all kinds of computer fairies!