diff --git a/.env.test b/.env.test
index cc8ff50b..ebe37860 100644
--- a/.env.test
+++ b/.env.test
@@ -1,6 +1,12 @@
+<<<<<<< HEAD
 VITE_USER_NODE_ENV = 'development'
 VITE_APP_BASE_URL = 'https://test.api.aida.com.hk'
 # VITE_APP_BASE_URL = 'https://api.aida.com.hk'
+=======
+NODE_ENV = 'development'
+# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
+VUE_APP_BASE_URL = 'https://test.api.aida.com.hk'
+>>>>>>> 5d8304ce3ece21dd3200ffffb0c76e3ef55dd213
 
 # VITE_APP_BASE_URL = 'http://18.167.251.121:10086'
 # VITE_APP_BASE_URL = 'http://192.168.1.9:5567'