issues/import/server/2017115-1100/details.md

@@ -47,16 +47,14 @@ I was able to replicate the `.zip` fail in windows as well
 
 ![](./media/Win7_wait_zip_50.png)
 
-<<<<<<< HEAD
+3. Fails
+
+![](./media/Win7_fail_zip_50.png)
+
 ## Java client on windows
 The bulk download in the OMERO.insight works. 
 In fact, it is better than the webclient as you have an option where to save to - in the web client you are restricted to the downloads folder.
 However, it downloads the files without creating a a `zip`.  Perhaps the compression library is not functioning? 
 
-=======
-3. Fails
->>>>>>> 49090b6eeb104565a093b73aa94997c94785ff3e
-
-![](./media/Win7_fail_zip_50.png)