diff --git a/.env b/.env
index 6fd6260c3..2f19f896f 100644
--- a/.env
+++ b/.env
@@ -2,15 +2,9 @@ APP_ENV=local
 APP_DEBUG=true
 APP_KEY=SomeRandomString
 DB_HOST=localhost
-<<<<<<< Updated upstream
 DB_DATABASE=faveo1.0.6
 DB_USERNAME=root
 DB_PASSWORD=
-=======
-DB_DATABASE=faveo-github
-DB_USERNAME=bhanu
-DB_PASSWORD=bhanu
->>>>>>> Stashed changes
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync