fix hotkeys + xsession after merge