diff --git a/.env.development b/.env.development
index 0783298..8c353a3 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
 # VITE_API_BASE='https://hwjb.homilychart.com/admin'
 VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
-# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
-=======
-VITE_API_BASE='https://hwjb.homilychart.com/admin'
->>>>>>> 3f86315c763df2cadd42226e5bbc74ea2917bf86
 # VITE_API_BASE='http://192.168.8.242:8081/'
 VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload