diff --git a/.gitattributes b/.gitattributes
index 1ff0c423..be3fd97e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10,7 +10,7 @@
 # default for csharp files.
 # Note: This is only used by command line
 ###############################################################################
-#*.cs     diff=csharp
+*.cs     diff=csharp
 
 ###############################################################################
 # Set the merge driver for project and solution files
diff --git a/NicoSitePlugin2/Api.cs b/NicoSitePlugin2/Api.cs
index 39369ec9..9987d425 100644
--- a/NicoSitePlugin2/Api.cs
+++ b/NicoSitePlugin2/Api.cs
@@ -16,12 +16,6 @@ public ApiGetCommunityLivesException()
         }
     }
     class NotLoggedInException : Exception { }
-    class UserInfo
-    {
-        public string Nickname { get; set; }
-        public string UserIconUrl { get; set; }
-
-    }
     static class Api
     {
         public static async Task<CommunityLiveInfo[]> GetCommunityLives(IDataSource server, CookieContainer cc, string communityId)
diff --git a/NicoSitePlugin2/TestCommentProvider.cs b/NicoSitePlugin2/TestCommentProvider.cs
index b0dbb1bd..cbe26f29 100644
--- a/NicoSitePlugin2/TestCommentProvider.cs
+++ b/NicoSitePlugin2/TestCommentProvider.cs
@@ -427,6 +427,9 @@ private async Task ProcessChatMessageAsync(Chat.IChatMessage message)
                             {
                                 _chatProvider?.Disconnect();
                             }
+                            if (chat.Name != null) {
+                                user.Name = Common.MessagePartFactory.CreateMessageItems(chat.Name);
+                            }
                             if (_siteOptions.IsAutoSetNickname)
                             {
                                 var nick = SitePluginCommon.Utils.ExtractNickname(chat.Content);