fix zsh keybindings
resolve conflicts