fixed conflicting key mapping