Resolve merge conflict

1 files changed, 7 insertions, 1 deletions

diff --git a/pkg/pool/static_pool.go b/pkg/pool/static_pool.go
index 9cf79fd4..e5a5a7e8 100755
--- a/pkg/pool/static_pool.go
+++ b/pkg/pool/static_pool.go
@@ -346,7 +346,13 @@ func (sp *StaticPool) allocateWorkers(ctx context.Context, numWorkers int64) ([]
 			cancel()
 			return nil, errors.E(op, errors.WorkerAllocate, err)
 		}
-		workers = append(workers, w)
+
+		sw, err := syncWorker.From(w)
+		if err != nil {
+			cancel()
+			return nil, errors.E(op, err)
+		}
+		workers = append(workers, sw)
 		cancel()
 	}
 	return workers, nil