make provider_url match certs
fix merge problem