merge changes, new nexus key and new raspi key