From b30626b3a487f4f591f3437a1a290c16c453f0da Mon Sep 17 00:00:00 2001
From: Riley Karson <rileykarson@google.com>
Date: Thu, 25 Apr 2019 23:25:13 +0000
Subject: [PATCH] =?UTF-8?q?Revert=20"Add=20conflicts=5Fwith=20for=20cluste?=
 =?UTF-8?q?r=20remove=5Fdefault=5Fnode=5Fpool=20and=20n=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Modular Magician <magic-modules@google.com>
---
 google/resource_container_cluster.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/google/resource_container_cluster.go b/google/resource_container_cluster.go
index 5933fe4b84a..bf69aed1401 100644
--- a/google/resource_container_cluster.go
+++ b/google/resource_container_cluster.go
@@ -436,7 +436,6 @@ func resourceContainerCluster() *schema.Resource {
 				Elem: &schema.Resource{
 					Schema: schemaNodePool,
 				},
-				ConflictsWith: []string{"remove_default_node_pool"},
 			},
 
 			"node_version": {
@@ -569,9 +568,8 @@ func resourceContainerCluster() *schema.Resource {
 			},
 
 			"remove_default_node_pool": {
-				Type:          schema.TypeBool,
-				Optional:      true,
-				ConflictsWith: []string{"node_pool"},
+				Type:     schema.TypeBool,
+				Optional: true,
 			},
 
 			"private_cluster_config": {