diff --git a/.env.example b/.env.example
index d926e6cde..377026980 100644
--- a/.env.example
+++ b/.env.example
@@ -32,11 +32,9 @@ INFOQUEST_API_KEY=your-infoquest-api-key
 
 # GitHub API Token
 # GITHUB_TOKEN=your-github-token
-<<<<<<< HEAD
 
 # Database (only needed when config.yaml has database.backend: postgres)
 # DATABASE_URL=postgresql://deerflow:password@localhost:5432/deerflow
-=======
+#
 # WECOM_BOT_ID=your-wecom-bot-id
 # WECOM_BOT_SECRET=your-wecom-bot-secret
->>>>>>> main