diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 402567cf8c6e80b7e82bbeb40a05e6d103e7b2d8..de8b052bd16b031957f0be9674341faa1b2206a1 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -5472,6 +5472,9 @@ impl BackgroundScanner {
                         },
                         &(),
                     );
+                    if status.is_conflicted() {
+                        repository.current_merge_conflicts.insert(repo_path.clone());
+                    }
 
                     if let Some(path) = project_path {
                         changed_paths.push(path);