Refactor ChatProvider: remove redundant code in backToWelcome and openChat functions

Author: JhayAlva

src/layout/chat/context/ChatContext.jsx

@@ -14,7 +14,6 @@ export const ChatProvider = ({ children }) => {
   };
 
   const backToWelcome = () => {
-<<<<<<< HEAD
     setScreen("welcome");
     setSelectedUser(null);
   }
@@ -24,20 +23,6 @@ export const ChatProvider = ({ children }) => {
     setSelectedUser(user);
     setIsChatOpen(true);
   };
-=======
-  
-  setScreen("welcome");
-  setSelectedUser(null);
-}
-
-
-    const openChat = (user) => {
-        toggleChat();
-        setScreen("chat");
-        setSelectedUser(user);
-        setIsChatOpen(true);
-    };
->>>>>>> dev
 
   const closeChat = () => {
     setSelectedUser(null);