Fix merge issues

src/core/Elsa.Abstractions/Elsa.Abstractions.csproj

@@ -24,8 +24,4 @@
       <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Scripting" />
-    </ItemGroup>
-
 </Project>

src/core/Elsa.Abstractions/Services/IActivityBuilder.cs

@@ -13,6 +13,7 @@ namespace Elsa.Services
         IActivityBuilder Add<T>(Action<T> setup = default, string name = null) where T : class, IActivity;
         IOutcomeBuilder When(string outcome);
         IActivityBuilder Then<T>(Action<T> setup = null, Action<IActivityBuilder> branch = null, string name = null) where T : class, IActivity;
+        IActivityBuilder WithName(string name);
         IActivityBuilder WithDisplayName(string displayName);
         IActivityBuilder WithDescription(string description);
         IWorkflowBuilder Then(string activityName);

src/samples/Sample17/CreatePersonWorkflow.cs

@@ -1,6 +1,5 @@
 using Elsa.Activities;
 using Elsa.Activities.Console.Activities;
-using Elsa.Activities.Primitives;
 using Elsa.Expressions;
 using Elsa.Scripting.JavaScript;
 using Elsa.Services;