add client id & secret
merge;