Fix duplicate merge conflicts

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);

test/Discord.Net.Tests.Unit/MockedEntities/MockedVoiceChannel.cs

@@ -27,7 +27,6 @@ namespace Discord
         public string Name => throw new NotImplementedException();
 
         public DateTimeOffset CreatedAt => throw new NotImplementedException();
-        public string Mention => throw new NotImplementedException();
         public ulong Id => throw new NotImplementedException();
 
         public Task AddPermissionOverwriteAsync(IRole role, OverwritePermissions permissions, RequestOptions options = null)