Add new API key
Fix merge conflict