fixed conflicting keybindings