diff --git a/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts b/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts
index 0a5ce4647..07e271cb6 100644
--- a/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts
+++ b/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts
@@ -1,11 +1,11 @@
-<<<<<<< HEAD
+
 export const API_BASE_URL = 'https://edrfreightapi.triaplc.com';
 //export const API_BASE_URL = 'http://localhost:3001';
-=======
-export const API_BASE_URL = import.meta.env.VITE_BASE_API_URL;
+
+
 
 // export const API_BASE_URL = 'http://localhost:3001';
->>>>>>> 8616f6dcdfa44089be2fd7b6a9867b20e320b305
+
 
 /**
  * URL that streams an uploaded file through the API by its UUID. Routes the
diff --git a/apps/edr-freight-web/portal/src/constants/apiConfig.ts b/apps/edr-freight-web/portal/src/constants/apiConfig.ts
index c51eb9e7b..07496364b 100644
--- a/apps/edr-freight-web/portal/src/constants/apiConfig.ts
+++ b/apps/edr-freight-web/portal/src/constants/apiConfig.ts
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 export const API_BASE_URL = 'https://edrfreightapi.triaplc.com';
 //export const API_BASE_URL = 'http://localhost:3001';
-=======
-export const API_BASE_URL = import.meta.env.VITE_BASE_API_URL;
->>>>>>> 8616f6dcdfa44089be2fd7b6a9867b20e320b305
 
 /**
  * URL that streams an uploaded file through the API by its UUID. Routes the