resolve conflicts

Author: adi611

pydra/engine/workers.py

@@ -898,4 +898,4 @@ def close(self):
     "slurm": SlurmWorker,
     "dask": DaskWorker,
     "sge": SGEWorker,
-}
+}