From 0fc29bc0f863fd1a90e50e0cad64599c0cf82492 Mon Sep 17 00:00:00 2001
From: Yang Hu <yhu@box.com>
Date: Wed, 17 May 2017 13:49:26 -0700
Subject: [PATCH] Handle the UploadFile conflict exception correctly

---
 Box.V2/Extensions/BoxResponseExtensions.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Box.V2/Extensions/BoxResponseExtensions.cs b/Box.V2/Extensions/BoxResponseExtensions.cs
index 601b4ab64..875a08c3a 100644
--- a/Box.V2/Extensions/BoxResponseExtensions.cs
+++ b/Box.V2/Extensions/BoxResponseExtensions.cs
@@ -58,11 +58,12 @@ public static IBoxResponse<T> ParseResults<T>(this IBoxResponse<T> response, IBo
                             switch (response.StatusCode)
                             {
                                 case System.Net.HttpStatusCode.Conflict:
-                                    if (response is IBoxResponse<BoxPreflightCheck>)
+                                    if (response is IBoxResponse<BoxPreflightCheck> || response is IBoxResponse<BoxCollection<BoxFile>>)
                                     {
                                         BoxPreflightCheckConflictError<BoxFile> err = converter.Parse<BoxPreflightCheckConflictError<BoxFile>>(response.ContentString);
                                         exToThrow = new BoxPreflightCheckConflictException<BoxFile>(response.ContentString, err) { StatusCode = response.StatusCode, ResponseHeaders = response.Headers };
-                                    } else
+                                    }
+                                    else
                                     {
                                         BoxConflictError<T> error = converter.Parse<BoxConflictError<T>>(response.ContentString);
                                         exToThrow = new BoxConflictException<T>(response.ContentString, error) { StatusCode = response.StatusCode, ResponseHeaders = response.Headers };