Resolve merge conflicts

Author: pulimsr

src/aws-cpp-sdk-transfer/source/transfer/TransferHandle.cpp

@@ -376,6 +376,11 @@ namespace Aws
             AWS_LOGSTREAM_TRACE(CLASS_TAG, "Transfer handle ID [" << GetId() << "] Restarting transfer.");
             m_cancel.store(false);
             m_lastPart.store(false);
+            
+            // Clear checksum state for retry
+            std::lock_guard<std::mutex> locker(m_getterSetterLock);
+            m_checksum.clear();
+            m_checksumAlgorithm = Aws::S3::Model::ChecksumAlgorithm::NOT_SET;
         }
 
         bool TransferHandle::ShouldContinue() const

src/aws-cpp-sdk-transfer/source/transfer/TransferManager.cpp

@@ -945,7 +945,6 @@ namespace Aws
                 handle->SetContentType(getObjectOutcome.GetResult().GetContentType());
                 handle->ChangePartToCompleted(partState, getObjectOutcome.GetResult().GetETag());
                 getObjectOutcome.GetResult().GetBody().flush();
-                
                 handle->UpdateStatus(TransferStatus::COMPLETED);
             }
             else
@@ -1224,7 +1223,7 @@ namespace Aws
                     Aws::IOStream* bufferStream = partState->GetDownloadPartStream();
                     assert(bufferStream);
 
-                    handle->AddChecksumForPart(bufferStream, partState);
+                    if (m_transferConfig.validateChecksums) { handle->AddChecksumForPart(bufferStream, partState); }
                     Aws::String errMsg{handle->WritePartToDownloadStream(bufferStream, partState->GetRangeBegin())};
                     if (errMsg.empty()) {
                         handle->ChangePartToCompleted(partState, outcome.GetResult().GetETag());