Update from Discord.Net dev - fix merge conflicts

src/Discord.Net.WebSocket/ClientState.cs

@@ -170,33 +170,5 @@ namespace Discord.WebSocket
             foreach (var id in ids)
                 _commands.TryRemove(id, out var _);
         }
-
-        internal SocketApplicationCommand GetCommand(ulong id)
-        {
-            if (_commands.TryGetValue(id, out SocketApplicationCommand command))
-                return command;
-            return null;
-        }
-        internal void AddCommand(SocketApplicationCommand command)
-        {
-            _commands[command.Id] = command;
-        }
-        internal SocketApplicationCommand GetOrAddCommand(ulong id, Func<ulong, SocketApplicationCommand> commandFactory)
-        {
-            return _commands.GetOrAdd(id, commandFactory);
-        }
-        internal SocketApplicationCommand RemoveCommand(ulong id)
-        {
-            if (_commands.TryRemove(id, out SocketApplicationCommand command))
-                return command;
-            return null;
-        }
-        internal void PurgeCommands(Func<SocketApplicationCommand, bool> precondition)
-        {
-            var ids = _commands.Where(x => precondition(x.Value)).Select(x => x.Key);
-
-            foreach (var id in ids)
-                _commands.TryRemove(id, out var _);
-        }
     }
 }

src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs

@@ -36,8 +36,6 @@ namespace Discord.WebSocket
         /// <inheritdoc />
         public string Mention => MentionUtils.MentionChannel(Id);
 
-        /// <inheritdoc />
-        public string Mention => MentionUtils.MentionChannel(Id);
         /// <inheritdoc />
         public Task SyncPermissionsAsync(RequestOptions options = null)
             => ChannelHelper.SyncPermissionsAsync(this, Discord, options);