From 1d00d7f5cad5d4d3d0a819bdff3ac4caa801fefa Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Wed, 11 Dec 2024 14:17:56 +0300
Subject: [PATCH] Fix Bug 72032 - File: ConflictResolveDialog: Fixed Cannot
 read properties of undefined (reading 'includes')

---
 .../src/components/dialogs/ConflictResolveDialog/index.tsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx b/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx
index 45600e55e37..85fb4c77638 100644
--- a/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx
+++ b/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx
@@ -285,7 +285,7 @@ const ConflictResolveDialog = (props: ConflictResolveDialogProps) => {
   const onCloseConflictDialog = () => {
     if (isUploadConflict) {
       cancelUploadAction();
-      onCloseDialog();
+      onClose();
     } else onCloseDialog();
   };