diff --git a/backend/src/plugins/Utility/commands/NicknameCmd.ts b/backend/src/plugins/Utility/commands/NicknameCmd.ts
index 75f6699d..21eb1a47 100644
--- a/backend/src/plugins/Utility/commands/NicknameCmd.ts
+++ b/backend/src/plugins/Utility/commands/NicknameCmd.ts
@@ -39,9 +39,17 @@ export const NicknameCmd = utilityCmd({
     const oldNickname = args.member.nickname || "<none>";
 
     try {
+<<<<<<< HEAD
       await args.member.setNickname(args.nickname ?? null);
     } catch {
       msg.channel.send(errorMessage("Failed to change nickname"));
+=======
+      await args.member.edit({
+        nick: args.nickname,
+      });
+    } catch {
+      msg.channel.createMessage(errorMessage("Failed to change nickname"));
+>>>>>>> 1ad3f4dd (removed unused exception parameter)
       return;
     }
 
diff --git a/backend/src/plugins/Utility/commands/NicknameResetCmd.ts b/backend/src/plugins/Utility/commands/NicknameResetCmd.ts
index dd8d82ca..06a62b96 100644
--- a/backend/src/plugins/Utility/commands/NicknameResetCmd.ts
+++ b/backend/src/plugins/Utility/commands/NicknameResetCmd.ts
@@ -19,13 +19,8 @@ export const NicknameResetCmd = utilityCmd({
       return;
     }
 
-<<<<<<< HEAD
     if (!args.member.nickname) {
       msg.channel.send(errorMessage("User does not have a nickname"));
-=======
-    if (!args.member.nick) {
-      msg.channel.createMessage(errorMessage(`<@!${args.member.id}> does not have a nickname`));
->>>>>>> 67f0227a (the commmand now sends the nickname of the member when a nickname isnt provided)
       return;
     }