shortcut conflict solved