Fix a conflict in key bindings