fixing conflicts

Client/src/App.jsx

@@ -81,8 +81,7 @@ function App() {
         <Route exact path="/login" element={<Login />} />
         <Route exact path="/register" element={<Register />} />
         {/* <Route path="/toast" element={<ToastComponent />} /> */}
-        {/* <Route path="*" element={<NotFound />} /> */}
-        <Route path="/not-found" element={<NotFound />} />
+        <Route path="*" element={<NotFound />} />
         <Route path="/forgot-password" element={<ForgotPassword />} />
         <Route path="/check-email" element={<CheckEmail />} />
         <Route path="/set-new-password/:token" element={<SetNewPassword />} />