fixed merge issues
s/CLIENT_KEY/CLIENT_ID/g