Resolving some conflicts in the shortcuts.