Fix keyguard merge