From c08e8135d91893f5dedb9a5f3080bbacff1d73a7 Mon Sep 17 00:00:00 2001
From: "hkantare@in.ibm.com" <hkantare@in.ibm.com>
Date: Wed, 12 Jun 2019 18:38:55 +0530
Subject: [PATCH] Remove conflict from provider

---
 ibm/provider.go | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/ibm/provider.go b/ibm/provider.go
index dc8761ee15..412b7d6e5a 100755
--- a/ibm/provider.go
+++ b/ibm/provider.go
@@ -17,34 +17,30 @@ func Provider() terraform.ResourceProvider {
 	return &schema.Provider{
 		Schema: map[string]*schema.Schema{
 			"bluemix_api_key": {
-				Type:          schema.TypeString,
-				Optional:      true,
-				Description:   "The Bluemix API Key",
-				DefaultFunc:   schema.MultiEnvDefaultFunc([]string{"BM_API_KEY", "BLUEMIX_API_KEY"}, ""),
-				Deprecated:    "This field is deprecated please use ibmcloud_api_key",
-				ConflictsWith: []string{"ibmcloud_api_key"},
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "The Bluemix API Key",
+				DefaultFunc: schema.MultiEnvDefaultFunc([]string{"BM_API_KEY", "BLUEMIX_API_KEY"}, ""),
+				Deprecated:  "This field is deprecated please use ibmcloud_api_key",
 			},
 			"bluemix_timeout": {
-				Type:          schema.TypeInt,
-				Optional:      true,
-				Description:   "The timeout (in seconds) to set for any Bluemix API calls made.",
-				DefaultFunc:   schema.MultiEnvDefaultFunc([]string{"BM_TIMEOUT", "BLUEMIX_TIMEOUT"}, 60),
-				Deprecated:    "This field is deprecated please use ibmcloud_timeout",
-				ConflictsWith: []string{"ibmcloud_timeout"},
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Description: "The timeout (in seconds) to set for any Bluemix API calls made.",
+				DefaultFunc: schema.MultiEnvDefaultFunc([]string{"BM_TIMEOUT", "BLUEMIX_TIMEOUT"}, 60),
+				Deprecated:  "This field is deprecated please use ibmcloud_timeout",
 			},
 			"ibmcloud_api_key": {
-				Type:          schema.TypeString,
-				Optional:      true,
-				Description:   "The IBM Cloud API Key",
-				DefaultFunc:   schema.MultiEnvDefaultFunc([]string{"IC_API_KEY", "IBMCLOUD_API_KEY"}, ""),
-				ConflictsWith: []string{"bluemix_api_key"},
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "The IBM Cloud API Key",
+				DefaultFunc: schema.MultiEnvDefaultFunc([]string{"IC_API_KEY", "IBMCLOUD_API_KEY"}, ""),
 			},
 			"ibmcloud_timeout": {
-				Type:          schema.TypeInt,
-				Optional:      true,
-				Description:   "The timeout (in seconds) to set for any IBM Cloud API calls made.",
-				DefaultFunc:   schema.MultiEnvDefaultFunc([]string{"IC_TIMEOUT", "IBMCLOUD_TIMEOUT"}, 60),
-				ConflictsWith: []string{"bluemix_timeout"},
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Description: "The timeout (in seconds) to set for any IBM Cloud API calls made.",
+				DefaultFunc: schema.MultiEnvDefaultFunc([]string{"IC_TIMEOUT", "IBMCLOUD_TIMEOUT"}, 60),
 			},
 			"region": {
 				Type:        schema.TypeString,