keybindings
fixed merge conflicts