# Fix merge conflict \(\#41853\) · gitcafe/zed

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

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

Visibility: public

Requested revision: d075a56ee75004b81e8bb258c6ed952d8b2f3157

Requested commit: d075a56ee75004b81e8bb258c6ed952d8b2f3157

Commit: d075a56ee75004b81e8bb258c6ed952d8b2f3157

Tree: 50fb0fb02647a47ddeddfb64a1f83d45ffc1cb70

Author: Conrad Irwin

Committer: GitHub

## Message

```
Fix merge conflict (#41853)

Closes #ISSUE

Release Notes:

- N/A
```

## Parents

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

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