fix conflict
fix conflict

GoogleCloudPlatform/php-docs-samples,GoogleCloudPlatform/php-docs-samples,GoogleCloudPlatform/php-docs-samples,GoogleCloudPlatform/php-docs-samples,GoogleCloudPlatform/php-docs-samples