Merge conflicts resolved

src/Umbraco.Infrastructure/PropertyEditors/BlockListConfigurationEditor.cs

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.IO;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Web.PropertyEditors
+{
+    internal class BlockListConfigurationEditor : ConfigurationEditor<BlockListConfiguration>
+    {
+        public BlockListConfigurationEditor(IIOHelper ioHelper) : base(ioHelper)
+        {
+        }
+    }
+}