# Fix merge conflict in collab \(\#9550\) · gitcafe/zed

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

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

Visibility: public

Requested revision: 5139aa38117a36e9e55abdcb047b9eafc84c6f45

Requested commit: 5139aa38117a36e9e55abdcb047b9eafc84c6f45

Commit: 5139aa38117a36e9e55abdcb047b9eafc84c6f45

Tree: ed12d014505aacfc0d61f069a656833d411f76ff

Author: Conrad Irwin

Committer: GitHub

## Message

```
Fix merge conflict in collab (#9550)

Release Notes:

- N/A
```

## Parents

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

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