add key registration
fix merge conflicts
more merge conflicts