fix conflits

Author: vallerion

README.md

@@ -108,14 +108,6 @@ if err != nil {
 }
 ```
 
-Conversations WhatsApp Sandbox
--------------
-To use the whatsapp sandbox you need to enable the `FeatureConversationsAPIWhatsAppSandbox` feature.
-
-```go
-	client.EnableFeatures(messagebird.FeatureConversationsAPIWhatsAppSandbox)
-```
-
 Documentation
 -------------
 Complete documentation, instructions, and examples are available at:

client.go

@@ -46,11 +46,6 @@ var (
 // A Feature can be enabled
 type Feature int
 
-const (
-	// FeatureConversationsAPIWhatsAppSandbox Enables the WhatsApp sandbox for conversations API.
-	FeatureConversationsAPIWhatsAppSandbox Feature = iota
-)
-
 type MessageBirdClient interface {
 	EnableFeatures(feature Feature)
 	DisableFeatures(feature Feature)

conversation/api.go

@@ -13,8 +13,6 @@ const (
 	// https://conversations.messagebird.com/v1/webhooks).
 	apiRoot = "https://conversations.messagebird.com/v1"
 
-	whatsappSandboxAPIRoot = "https://whatsapp-sandbox.messagebird.com/v1"
-
 	// path is the path for the Conversation resource, relative to apiRoot.
 	path = "conversations"
 
@@ -55,12 +53,6 @@ func (lro *PaginationRequest) QueryParams() string {
 // request does the exact same thing as Client.Request. It does, however,
 // prefix the path with the Conversation API's root. This ensures the client
 // doesn't "handle" this for us: by default, it uses the REST API.
-func request(c messagebird.MessageBirdClient, v interface{}, method, path string, data interface{}) error {
-	var root string
-	if c.IsFeatureEnabled(messagebird.FeatureConversationsAPIWhatsAppSandbox) {
-		root = whatsappSandboxAPIRoot
-	} else {
-		root = apiRoot
-	}
-	return c.Request(v, method, fmt.Sprintf("%s/%s", root, path), data)
+func request(c *messagebird.Client, v interface{}, method, path string, data interface{}) error {
+	return c.Request(v, method, fmt.Sprintf("%s/%s", apiRoot, path), data)
 }