remap keys to ones that don't have conflict

 fixes #963