diff --git a/.env.development b/.env.development
index 3b2ba8f..6620010 100644
--- a/.env.development
+++ b/.env.development
@@ -2,5 +2,10 @@ VITE_APP_NAME=tpay-dashboard-tl
 VITE_APP_VERSION=1=9.1.1
 GENERATE_SOURCEMAP=false
 
+<<<<<<< HEAD
 VITE_APP_API_URL=http://localhost:8080
+=======
+# VITE_APP_API_URL=
+VITE_APP_API_URL=http://127.0.0.1:4003/api
+>>>>>>> 85530a1 (update)
 VITE_ENV=development