diff --git a/OnlineQuizPlatform/config.py b/OnlineQuizPlatform/config.py
index 14beec2..ef228a8 100644
--- a/OnlineQuizPlatform/config.py
+++ b/OnlineQuizPlatform/config.py
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
+
 EMAIL_ACC = "onlinequizplatfom@gmail.com"
 PASSWORD = "@Cse2020"
-=======
-EMAIL_ACC = "onlinequizplatfom@gmail.com" #User Your Own Email
-PASSWORD = "@Cse2020" #Enter Password
->>>>>>> 6b91886cbdc723847ed9d09446e898c8e174bc22