old_contents: from discord.ext import commands
  import aiohttp
  import logging
  from giphypop import Giphy
  
  
  class FoxxBotCog():
      def __init__(self, bot):
          self.bot = bot
      
      @commands.command()
      async def twitch(self,user : str):
          """returns a twitch channel, if a user is live."""
          url = "https://api.twitch.tv/kraken/streams/{}".format(user)
          res = await aiohttp.get(url)
          link = "https://twitch.tv/{}".format(user)
          res = aiohttp.get(url)        
          try:
              content = await res.json()
              is_live = content["stream"]
          except KeyError:
              await self.bot.say("Sorry user could not be found.")
          else:
              if is_live is None:
                  bot_res = "Sorry {} is not live".format(user)
              else:
                  bot_res = "{} is live! Watch Now! {}".format(user,link)
          
          await self.bot.say(bot_res)
  
       
      @commands.command(description="Interested in seeing what makes Foxxbot...Foxxbot")
      async def source(self):
          """displays the source code link for Foxxbot"""
          await self.bot.say("https://github.com/ggreenleaf/discordbot.git")   
  
  def setup(bot):
      bot.add_cog(FoxxBotCog(bot))
  
new_contents: from discord.ext import commands
  import aiohttp
  import logging
  from giphypop import Giphy
  
  
  class FoxxBotCog():
      def __init__(self, bot):
          self.bot = bot
      
      @commands.command()
      async def twitch(self,user : str):
          """returns a twitch channel, if a user is live."""
          url = "https://api.twitch.tv/kraken/streams/{}".format(user)
          res = await aiohttp.get(url)
          link = "https://twitch.tv/{}".format(user)
  
  
          async with aiohttp.get(url) as res:            
              try:
                  content = await res.json()
                  is_live = content["stream"]
              except KeyError:
                  await self.boy.say("Sorry user could not be found.")
              else:
                  if is_live is None:
                      bot_res = "Sorry {} is not live".format(user)
                  else:
                      bot_res = "{} is live! Watch Now! {}".format(user,link)
          
          await self.bot.say(bot_res)
  
       
      @commands.command(description="Interested in seeing what makes Foxxbot...Foxxbot")
      async def source(self):
          """displays the source code link for Foxxbot"""
          await self.bot.say("https://github.com/ggreenleaf/discordbot.git")   
  
  def setup(bot):
      bot.add_cog(FoxxBotCog(bot))
  
subject: fix merge conflicts with commands