Fixed merge conflict

main.tf

@@ -1,3 +1,9 @@
+resource "google_project_iam_member" "artifact_role" {
+  role = "roles/artifactregistry.reader"
+  member  = var.gke_service_account_name
+  project = var.gcp_project_id
+}
+
 resource "kubernetes_namespace" "nodexpressv3" {
   metadata {
     name = "nodexpressv3-namespace"
@@ -50,8 +56,4 @@ resource "kubernetes_service" "api-skaffold_service" {
       target_port = 3000
     }
   }
-   wait_for_completion = true
-   timeouts {
-   create = "40s"
- }
-}
+}

variables.tf

@@ -11,7 +11,7 @@ variable "gcp_region" {
 }
 
 variable "gke_cluster_name" {
-  default     = "experimental-cluster"
+  default     = "expiremental-cluster"
   description = "Name of the cluster to deploy to"
 }