Remove tab switching keybindings
Fix merge conflicts