From 367c1d3006a082363b24052a2c0fc8f32b46cdee Mon Sep 17 00:00:00 2001
From: quin lynch <lynchquin@gmail.com>
Date: Tue, 11 Jan 2022 03:20:14 -0400
Subject: [PATCH] Fix merge errors

---
 src/Discord.Net.WebSocket/DiscordShardedClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Discord.Net.WebSocket/DiscordShardedClient.cs b/src/Discord.Net.WebSocket/DiscordShardedClient.cs
index ac0ca5b9f..6e943dde3 100644
--- a/src/Discord.Net.WebSocket/DiscordShardedClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordShardedClient.cs
@@ -580,7 +580,6 @@ namespace Discord.WebSocket
                         foreach (var client in _shards)
                             client?.Dispose();
                     }
-                    _connectionGroupLock?.Dispose();
                 }
 
                 _isDisposed = true;
@@ -588,5 +587,6 @@ namespace Discord.WebSocket
 
             return base.DisposeAsync(disposing);
         }
+        #endregion
     }
 }