more sensible handling of our special hotkey default binding "conflicts"#4584

SuuperW wants to merge 1 commit intomasterTASEmulators/BizHawk:masterfrom

hotkey_conflictTASEmulators/BizHawk:hotkey_conflictCopy head branch name to clipboard