# Fix conflict state \(was broken by merge conflict\) \(\#25354\) · gitcafe/zed

[View on GitCafe](https://git.cafe/gitcafe/zed/commit/6516249302a3f6e7c311ca58414b096219d301e1)

Repository: [gitcafe/zed](https://git.cafe/gitcafe/zed)

Visibility: public

Requested revision: 6516249302a3f6e7c311ca58414b096219d301e1

Requested commit: 6516249302a3f6e7c311ca58414b096219d301e1

Commit: 6516249302a3f6e7c311ca58414b096219d301e1

Tree: be3dc04c4c09106a60aead2085d7343f0c035cde

Author: Conrad Irwin

Committer: GitHub

## Message

```
Fix conflict state (was broken by merge conflict) (#25354)

Closes #ISSUE

Release Notes:

- N/A
```

## Parents

- [fc8218d7288243ec0a339854d6c981c02877163e](https://git.cafe/gitcafe/zed/commit/fc8218d7288243ec0a339854d6c981c02877163e?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zed/tree/6516249302a3f6e7c311ca58414b096219d301e1?format=markdown)