diff --git a/addons/isl-server/src/commands.ts b/addons/isl-server/src/commands.ts
index 4ed1da8aad..f3b9012350 100644
--- a/addons/isl-server/src/commands.ts
+++ b/addons/isl-server/src/commands.ts
@@ -41,6 +41,10 @@ export type ResolveCommandConflictOutput = [
         path: string;
       }>;
       pathconflicts: Array<never>;
+      hashes?: {
+        local?: string;
+        other?: string;
+      };
     },
 ];
 
@@ -280,6 +284,7 @@ export function computeNewConflicts(
     files: [],
     fetchStartTimestamp,
     fetchCompletedTimestamp: Date.now(),
+    hashes: newConflictData.hashes,
   };
 
   const previousFiles = previousConflicts?.files ?? [];
diff --git a/addons/isl/src/types.ts b/addons/isl/src/types.ts
index 0059e22f62..7aec9c2d90 100644
--- a/addons/isl/src/types.ts
+++ b/addons/isl/src/types.ts
@@ -424,6 +424,7 @@ type ConflictInfo = {
   files: Array<ChangedFile & {conflictType: ConflictType}>;
   fetchStartTimestamp: number;
   fetchCompletedTimestamp: number;
+  hashes?: {local?: string; other?: string};
 };
 export type MergeConflicts =
   | ({state: 'loading'} & AllUndefined<ConflictInfo>)