merge conflict and get currently playing track

NemAnCore/Services/StatsClientService.cs

             _serviceClient = channel.CreateGrpcService<IStatsService>();
         }
         public async Task<TrackResponse> GetCurrentlyPlayingTrack(TokenMessage token)
-        {
+    {
             return await _serviceClient.GetCurrentlyPlayingTrack(token);
         }
     }

gRPCServer/Services/StatsService.cs

         public StatsService(IHttpClientFactory httpClientFactory)
         {
             _httpClientFactory = httpClientFactory;
-        }     
+        }
 
         public async Task<TrackResponse> GetCurrentlyPlayingTrack(TokenMessage token)
         {