From 7d81aadc240ce1790489e441130703384675074b Mon Sep 17 00:00:00 2001
From: Harunobu Ishii <harunobuishii547@gmail.com>
Date: Thu, 6 Jun 2024 16:05:28 -0400
Subject: [PATCH] merge conflict resolved

---
 lib/client/preprocessing/api.js    | 2 +-
 lib/client/preprocessing/daemon.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/client/preprocessing/api.js b/lib/client/preprocessing/api.js
index 9728bd9b8..fd24f676b 100644
--- a/lib/client/preprocessing/api.js
+++ b/lib/client/preprocessing/api.js
@@ -142,7 +142,7 @@ class PreprocessingAPI {
       id: null,
       params: params,
       protocols: protocols,
-      deferred: new this.jiffClient.helpers.Deferred()
+      deferred: this.jiffClient.helpers.createDeferred()
     };
 
     this.preprocessingTasks[this.preprocessingTasks.length - 1].add(task);
diff --git a/lib/client/preprocessing/daemon.js b/lib/client/preprocessing/daemon.js
index 846dda427..949f40059 100644
--- a/lib/client/preprocessing/daemon.js
+++ b/lib/client/preprocessing/daemon.js
@@ -11,8 +11,8 @@ class PreprocessDaemon {
     if (task.count > 1) {
       const remainingTasks = Object.assign({}, task);
 
-      const deferred1 = new this.jiffClient.helpers.Deferred();
-      const deferred2 = new this.jiffClient.helpers.Deferred();
+      const deferred1 = this.jiffClient.helpers.createDeferred();
+      const deferred2 = this.jiffClient.helpers.createDeferred();
       Promise.all([deferred1.promise, deferred2.promise]).then(task.deferred.resolve);
       task.deferred = deferred1;
       remainingTasks.deferred = deferred2;
@@ -169,7 +169,7 @@ class PreprocessDaemon {
         id: null,
         params: extra_params,
         protocols: task.protocols,
-        deferred: new this.jiffClient.helpers.Deferred()
+        deferred: this.jiffClient.helpers.createDeferred()
       };
 
       deferredChain.push(nextTask.deferred.promise);