diff --git a/packages/api/.env.example b/packages/api/.env.example
index 16c2be29e..5cd31f371 100644
--- a/packages/api/.env.example
+++ b/packages/api/.env.example
@@ -1,7 +1,3 @@
 ENV=dev
 DATABASE_URL=
-<<<<<<< HEAD
-JWT_SECRET=
-=======
 JWT_SECRET="SECRET"
->>>>>>> feat/fix-auth