1 files changed, 18 insertions, 0 deletions
diff --git a/commands/Utility/userinfo.js b/commands/Utility/userinfo.js
index 851dc01..0154d98 100644
--- a/commands/Utility/userinfo.js
+++ b/commands/Utility/userinfo.js
@@ -1,4 +1,5 @@
 exports.run = async (bot, msg) => {
+<<<<<<< HEAD
     const { RichEmbed } = require('discord.js');
     if (!msg.mentions.users.first()) {
         var user = msg.author;
@@ -13,6 +14,23 @@ exports.run = async (bot, msg) => {
         .addField('Account Creation Date', user.user.createdAt)
         .addField('Join Guild Date', user.joinedAt)
         .addField('Names', 'Display Name: ' + user.displayName + `\nUsername: ${user.user.tag}`)
+=======
+  const { RichEmbed } = require('discord.js');
+  let user;
+  if (!msg.mentions.members.first()) {
+    user = msg.member;
+  } else {
+    user = msg.mentions.members.first();
+  }
+  msg.channel.send(
+    new RichEmbed()
+      .setColor(0x00ae86)
+      .setTitle('User Information')
+      .addField('User ID', user.id)
+      .addField('Account Creation Date', user.user.createdAt)
+      .addField('Join Guild Date', user.joinedAt)
+      .addField('Names', 'Display Name: ' + user.displayName + `\nUsername: ${user.user.tag}`)
+>>>>>>> f6c8e529eb06a3d1121feeebb5de6c97eefbc571
   );
 };