fix merge conflicts

MediaBrowser.Model/System/SystemInfo.cs

@@ -86,6 +86,12 @@ namespace MediaBrowser.Model.System
         /// <value>The failed assembly loads.</value>
         public List<string> FailedPluginAssemblies { get; set; }
 
+        /// <summary>
+        /// Gets or sets the image enhancers.
+        /// </summary>
+        /// <value>The image enhancers.</value>
+        public List<string> ImageEnhancers { get; set; }
+
         /// <summary>
         /// Gets or sets the program data path.
         /// </summary>
@@ -162,6 +168,7 @@ namespace MediaBrowser.Model.System
             CompletedInstallations = new List<InstallationInfo>();
 
             FailedPluginAssemblies = new List<string>();
+            ImageEnhancers = new List<string>();
         }
     }
 }