fix merge conflicts

MediaBrowser.Providers/Manager/ItemImageProvider.cs

@@ -359,13 +359,12 @@ namespace MediaBrowser.Providers.Manager
         private void ClearImages(IHasImages item, ImageType type)
         {
             var deleted = false;
-            var deletedImages = new List<ItemImageInfo>();
 
             foreach (var image in item.GetImages(type).ToList())
             {
                 if (!image.IsLocalFile)
                 {
-                    deletedImages.Add(image);
+                    // TODO: Need to get this image removed
                     continue;
                 }
 
@@ -385,11 +384,6 @@ namespace MediaBrowser.Providers.Manager
                 }
             }
 
-            foreach (var image in deletedImages)
-            {
-                item.RemoveImage(image);
-            }
-
             if (deleted)
             {
                 item.ValidateImages(new DirectoryService(_logger, _fileSystem));