diff --git a/frontend/.env.development b/frontend/.env.development
index 8d7c68bc..ba21c0c6 100644
--- a/frontend/.env.development
+++ b/frontend/.env.development
@@ -1,7 +1,3 @@
 NODE_ENV='development'
-<<<<<<< Updated upstream
 VUE_APP_BASE_URL=http://localhost:8000
-VUE_APP_CRAWLAB_BASE_URL=https://api.crawlab.cn
-=======
-VUE_APP_BASE_URL=http://localhost:8001
->>>>>>> Stashed changes
+VUE_APP_CRAWLAB_BASE_URL=https://api.crawlab.cn
\ No newline at end of file