Fixed API keys after merge errors