fixed merge conflict

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: sixteen
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

README.md

@@ -0,0 +1,14 @@
+# matteo-the-prestige
+simsim discord bot
+
+blaseball, blaseball, is back! in an unofficial capacity.
+
+custom players, custom teams, custom leagues (that last one is coming soon™) all in discord! 
+
+
+
+we've also got things like player  idolization, easy setup for quick pick-up games featuring any players you like (including those not on a team), and onomancer lookup
+
+(command description coming soon, i promise)
+
+accepting pull requests, check the issues for to-dos