diff --git a/default_api.go b/default_api.go
index 8f78ce3..973edc3 100644
--- a/default_api.go
+++ b/default_api.go
@@ -4595,6 +4595,7 @@ func (a *DefaultApiService) GetRawContent(projectKey, repositorySlug, path strin
 	)
 
 	// create path and map variables
+<<<<<<< HEAD
 	localVarPath := a.client.cfg.BasePath + "/api/1.0/projects/{projectKey}/repos/{repositorySlug}/raw/{path}"
 	localVarPath = strings.Replace(localVarPath, "{"+"projectKey"+"}", fmt.Sprintf("%v", projectKey), -1)
 	localVarPath = strings.Replace(localVarPath, "{"+"repositorySlug"+"}", fmt.Sprintf("%v", repositorySlug), -1)
@@ -4602,6 +4603,12 @@ func (a *DefaultApiService) GetRawContent(projectKey, repositorySlug, path strin
 	localVarPath = strings.Replace(localVarPath, "{"+"projectKey"+"}", fmt.Sprintf("%v", projectKey), -1)
 	localVarPath = strings.Replace(localVarPath, "{"+"repositorySlug"+"}", fmt.Sprintf("%v", repositorySlug), -1)
 
+=======
+	localVarPath := a.client.cfg.BasePath + "/" + projectKey + "/repos/" + repositorySlug + "/raw/" + path
+	localVarPath = strings.Replace(localVarPath, "/rest/", "/projects/", 1)
+	// https://bitbucket.global.standardchartered.com/projects/CISO/repos/planes/raw/enactments/tes_mattermost.yaml?at=refs%2Fheads%2Fstate%2Fdev
+	// https://bitbucket.global.standardchartered.com/projects/CISO/repos/planes/raw/enactments/tes_mattermost.yaml?at=refs%2Fheads%2Fstate%2Fdev
+>>>>>>> 2cd48ac (Cleanup the debug)
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := url.Values{}
 	localVarFormParams := url.Values{}