diff --git a/src/ImageProcessor.Web/NET45/Caching/MemCache.cs b/src/ImageProcessor.Web/NET45/Caching/MemCache.cs
index 0eb42a887..900192b22 100644
--- a/src/ImageProcessor.Web/NET45/Caching/MemCache.cs
+++ b/src/ImageProcessor.Web/NET45/Caching/MemCache.cs
@@ -181,7 +181,12 @@ namespace ImageProcessor.Web.Caching
 
                 if (isRemoved)
                 {
+<<<<<<< HEAD
                     CacheItems.Keys.Remove(key);
+=======
+                    string removedValue;
+                    CacheItems.TryRemove(key, out removedValue);
+>>>>>>> origin/dev
                 }
             }
 
@@ -228,7 +233,12 @@ namespace ImageProcessor.Web.Caching
                     // Loop through and clear out the dictionary of cache keys.
                     foreach (KeyValuePair<string, string> cacheItem in tempDictionary)
                     {
+<<<<<<< HEAD
                         CacheItems.Keys.Remove(cacheItem.Key);
+=======
+                        string removedValue;
+                        CacheItems.TryRemove(cacheItem.Key, out removedValue);
+>>>>>>> origin/dev
                     }
                 }
             }
@@ -237,4 +247,8 @@ namespace ImageProcessor.Web.Caching
         }
         #endregion
     }
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> origin/dev
diff --git a/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs b/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
index 9466fd9bb..f053f9230 100644
--- a/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
+++ b/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
@@ -31,5 +31,11 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
+<<<<<<< HEAD
 [assembly: AssemblyVersion("3.0.0.0")]
 [assembly: AssemblyFileVersion("3.0.0.0")]
+=======
+[assembly: AssemblyVersion("3.0.0.1")]
+[assembly: AssemblyFileVersion("3.0.0.1")]
+
+>>>>>>> origin/dev
diff --git a/src/Nuget/ImageProcessor.Web.3.0.0.1.nupkg b/src/Nuget/ImageProcessor.Web.3.0.0.1.nupkg
new file mode 100644
index 000000000..757429587
Binary files /dev/null and b/src/Nuget/ImageProcessor.Web.3.0.0.1.nupkg differ