     @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?

    @registerCommand '+', { argSeparator: ' ' }, (msg, args, d)=>
      return if msg.author.bot or args.length < 2
      return unless d.data.allowTags
      # Get or create a new tag
      tag = (await Core.data.get("Tag:#{args[0]}")) or []
      # Add the response
      tag.push {
        reply: args.slice(1).join(' ')
        by: msg.author.id
      }

    @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?
