diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs
index bfee14c1c29ed19c1f4831d2ab2c95dc1bdff7d3..16ddf73e9c5df8b0f09f931658f7d7c738cc3ddb 100644
--- a/crates/project/src/git_store.rs
+++ b/crates/project/src/git_store.rs
@@ -2582,9 +2582,7 @@ impl RepositorySnapshot {
     }
 
     pub fn has_conflict(&self, repo_path: &RepoPath) -> bool {
-        self.statuses_by_path
-            .get(&PathKey(repo_path.0.clone()), &())
-            .map_or(false, |entry| entry.status.is_conflicted())
+        self.merge_conflicts.contains(repo_path)
     }
 
     /// This is the name that will be displayed in the repository selector for this repository.