# Fix conflicts in Linux default keymap \(\#36519\) · gitcafe/zed

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

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

Visibility: public

Requested revision: aa0f7a2d09c06331dbb176a8b0e45235f1ad8516

Requested commit: aa0f7a2d09c06331dbb176a8b0e45235f1ad8516

Commit: aa0f7a2d09c06331dbb176a8b0e45235f1ad8516

Tree: ba559cc07f2a45aa27955a1332258adcb09f28de

Author: Peter Tripp

Committer: GitHub

## Message

```
Fix conflicts in Linux default keymap (#36519)

Closes https://github.com/zed-industries/zed/issues/29746

| Action | New Key | Old Key | Former Conflict |
| - | - | - | - |
| `edit_prediction::ToggleMenu` | `ctrl-alt-shift-i` | `ctrl-shift-i` |
`editor::Format` |
| `editor::ToggleEditPrediction` | `ctrl-alt-shift-e` | `ctrl-shift-e` |
`project_panel::ToggleFocus` |

These aren't great keys and I'm open to alternate suggestions, but the
will work out of the box without conflict.

Release Notes:

- N/A
```

## Parents

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

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