fix keys conflicts