Resolve conflict in lab 6
Resolve conflict in lab 6

terraform-google-modules/cloud-foundation-training,terraform-google-modules/cloud-foundation-training,terraform-google-modules/cloud-foundation-training