Sovled the rebase code errors

Marco.Pms.Services/Controllers/TaskController.cs

@@ -31,6 +31,7 @@ namespace MarcoBMS.Services.Controllers
         private readonly S3UploadService _s3Service;
         private readonly ILoggingService _logger;
         private readonly IHubContext<MarcoHub> _signalR;
+        private readonly CacheUpdateHelper _cache;
         private readonly PermissionServices _permissionServices;
 
         public TaskController(ApplicationDbContext context, UserHelper userHelper, S3UploadService s3Service, ILoggingService logger, PermissionServices permissionServices,
@@ -41,6 +42,7 @@ namespace MarcoBMS.Services.Controllers
             _s3Service = s3Service;
             _logger = logger;
             _signalR = signalR;
+            _cache = cache;
             _permissionServices = permissionServices;
         }