.env for api key and secret
fixes merge conflict