Merge conflict fixes

src/Umbraco.Web/Editors/ContentControllerBase.cs

@@ -97,6 +97,13 @@ namespace Umbraco.Web.Editors
                 var dictionary = new Dictionary<string, object>();
                 //add the files if any
                 var files = contentItem.UploadedFiles.Where(x => x.PropertyAlias == property.Alias).ToArray();
+                if (files.Length > 0)
+                {
+                    dictionary.Add("files", files);
+                    // add extra things needed to figure out where to put the files
+                    dictionary.Add("cuid", contentItem.PersistedContent.Key);
+                    dictionary.Add("puid", dboProperty.PropertyType.Key);
+                }
 
                 foreach (var file in files)
                     file.FileName = file.FileName.ToSafeFileName();