diff --git a/gwendolyn/cogs/misc_cog.py b/gwendolyn/cogs/misc_cog.py
index 0b4d4d6..43df97d 100644
--- a/gwendolyn/cogs/misc_cog.py
+++ b/gwendolyn/cogs/misc_cog.py
@@ -61,18 +61,30 @@ class MiscCog(commands.Cog):
 
     @cog_ext.cog_slash(**params["name"])
     async def name(self, ctx: SlashContext):
+<<<<<<< HEAD
         """_generate a random name."""
+=======
+        """Generate a random name."""
+>>>>>>> 89d0c0b9fba7de53e5ff5de563e41ae22303e3e8
         await self.generators.name_gen(ctx)
 
     @cog_ext.cog_slash(**params["tavern"])
     async def tavern(self, ctx: SlashContext):
+<<<<<<< HEAD
         """_generate a random tavern name."""
+=======
+        """Generate a random tavern name."""
+>>>>>>> 89d0c0b9fba7de53e5ff5de563e41ae22303e3e8
         await self.generators.tavern_gen(ctx)
 
     @cog_ext.cog_slash(**params["wiki"])
     async def wiki(self, ctx: SlashContext, wiki_page=""):
         """Get a page on a fandom wiki."""
+<<<<<<< HEAD
         await self.bot.other.find_wiki_page(ctx, page)
+=======
+        await self.bot.other.find_wiki_page(ctx, wiki_page)
+>>>>>>> 89d0c0b9fba7de53e5ff5de563e41ae22303e3e8
 
     @cog_ext.cog_slash(**params["add_movie"])
     async def add_movie(self, ctx: SlashContext, movie):
diff --git a/requirements.txt b/requirements.txt
index 443fc5c..4f635bf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,5 @@
-aiohttp==3.8.1
-async-timeout==4.0.2
-attrs==21.2.0
-beautifulsoup4==4.9.3
-cachetools==4.2.2
-certifi==2021.5.30
-chardet==4.0.0
-charset-normalizer==2.0.4
 d20==1.1.2
+<<<<<<< HEAD
 discord.py>=1.7.3
 discord-py-slash-command==3.0.1
 dnspython==1.16.0
@@ -33,6 +26,17 @@ SQLAlchemy==1.4.22
 typing-extensions==3.10.0.0
 urllib3==1.26.6
 wheel==0.37.0
+=======
+discord.py==1.7.3
+discord_py_slash_command==3.0.3
+fandom_py==0.2.1
+finnhub_python==2.4.13
+GitPython==3.1.27
+IMDbPY==2021.4.18
+lxml==4.8.0
+Pillow==9.1.0
+pymongo==4.1.1
+requests==2.27.1
+>>>>>>> 89d0c0b9fba7de53e5ff5de563e41ae22303e3e8
 wolframalpha==5.0.0
-xmltodict==0.12.0
-yarl==1.6.3
+xmltodict==0.13.0