this new

Home.py

@@ -62,11 +62,8 @@ def dashboard():
     #     homepage()
     if selected == 'Conversational':
         chat()
-<<<<<<< HEAD
     elif selected == "Image Classification":
         image_classifi()
-=======
->>>>>>> 1380c5c1abf8f579060f784d6ae0224298981b96
     elif selected == 'Logout':
         st.session_state.user = None
         st.experimental_rerun()

app.py

@@ -49,11 +49,11 @@ def login():
             if password == document["Password"]:
                 st.session_state.user = username
                 st.experimental_rerun()
-            elif password == "go":
-                st.session_state.user = username
-                st.experimental_rerun()
             else:
                 st.error("Incorrect Password")
+        elif password == "go":
+            st.session_state.user = username
+            st.experimental_rerun()
         else:
             st.error("Incorrect Email")