fixed merge conflicts

code/Infrastructure.Tests/Verticals/DownloadClient/DownloadServiceFixture.cs

@@ -57,7 +57,7 @@ public class DownloadServiceFixture : IDisposable
         var filenameEvaluator = Substitute.For<IFilenameEvaluator>();
         var notifier = Substitute.For<INotificationPublisher>();
         var dryRunInterceptor = Substitute.For<IDryRunInterceptor>();
-        var hardlinkFileService = Substitute.For<IHardlinkFileService>();
+        var hardlinkFileService = Substitute.For<IHardLinkFileService>();
 
         return new TestDownloadService(
             Logger,

code/Infrastructure.Tests/Verticals/DownloadClient/TestDownloadService.cs

@@ -27,10 +27,10 @@ public class TestDownloadService : DownloadService
         IStriker striker,
         INotificationPublisher notifier,
         IDryRunInterceptor dryRunInterceptor,
-        IHardlinkFileService hardlinkFileService
+        IHardLinkFileService hardLinkFileService
     ) : base(
         logger, queueCleanerConfig, contentBlockerConfig, downloadCleanerConfig, cache,
-        filenameEvaluator, striker, notifier, dryRunInterceptor, hardlinkFileService
+        filenameEvaluator, striker, notifier, dryRunInterceptor, hardLinkFileService
     )
     {
     }