     @registerCommand '-', { argSeparator: ' ' }, (msg, args, d)=>
       return if msg.author.bot or args.length < 1
       return unless d.data.allowTags
+<<<<<<< HEAD
       # Try to get existing tag
       tag = await Core.data.get("Tag:#{args[0].toLowerCase()}")
       return msg.reply 'Deleted 0 tag(s)!' unless tag?

            return false
          # Other people can only delete their own
          return false if reply.by is msg.author.id and reply.reply is args.slice(1).join(' ')
        else
          # If no response is defined, delete all the responses made by the user
          return false if reply.by is msg.author.id

    @registerCommand '!', { argSeparator: ' ' }, (msg, args, d)=>
      return if msg.author.bot or args.length < 1
      return unless d.data.allowTags
<<<<<<< HEAD
      # Get the tag
      tag = await Core.data.get("Tag:#{args[0].toLowerCase()}")
      return unless tag?
