fix conflicts

Author: kirsanium

src/WorkflowCore/Interface/IWorkflowModifier.cs

@@ -83,6 +83,13 @@ IStepBuilder<TData, WaitFor> WaitFor(string eventName,
     /// <param name="collection">Resolves a collection for iterate over</param>
     /// <returns></returns>
     IContainerStepBuilder<TData, Foreach, Foreach> ForEach(Expression<Func<TData, IEnumerable>> collection);
+    
+    /// <summary>
+    /// Execute a block of steps, once for each item in a collection in a RunParallel foreach
+    /// </summary>
+    /// <param name="collection">Resolves a collection for iterate over</param>
+    /// <returns></returns>
+    IContainerStepBuilder<TData, Foreach, Foreach> ForEach(Expression<Func<TData, IEnumerable>> collection, Expression<Func<TData, bool>> runParallel);
 
     /// <summary>
     /// Repeat a block of steps until a condition becomes true

src/WorkflowCore/Services/FluentBuilders/WorkflowBuilder.cs

@@ -197,6 +197,11 @@ public IContainerStepBuilder<TData, Foreach, Foreach> ForEach(Expression<Func<TD
         {
             return Start().ForEach(collection);
         }
+        
+        public IContainerStepBuilder<TData, Foreach, Foreach> ForEach(Expression<Func<TData, IEnumerable>> collection, Expression<Func<TData, bool>> runParallel)
+        {
+            return Start().ForEach(collection, runParallel);
+        }
 
         public IContainerStepBuilder<TData, While, While> While(Expression<Func<TData, bool>> condition)
         {