Update keybindings
Merge