removed keys
fixed merge conflicts