Resolved merge conflicts

frontend/src/App.jsx

@@ -3,6 +3,11 @@ import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
 import PagenotFound from "./components/PagenotFound";
 import Search from "./components/Search/Search";
 import Home from "./components/Home/Home";
+import Aboutus from "./pages/Aboutus"
+import Blog from "./pages/Blog"
+import Terms from "./pages/Terms"
+import Contactus from "./pages/Contactus"
+import Culture from "./pages/Culture"
 
 const App = () => {
   return (
@@ -11,6 +16,11 @@ const App = () => {
         <Route path="/search" element={<Search />} />
         <Route path="/" element={<Home />} />
         <Route path="*" element={<PagenotFound />} />
+        <Route path="/aboutus" element={<Aboutus />} />
+        <Route path="/terms" element={<Terms />} />
+        <Route path="/contactus" element={<Contactus />} />
+        <Route path="/blog" element={<Blog />} />
+        <Route path="/culture" element={<Culture />} />
       </Routes>
     </Router>
   );

frontend/src/components/Footer.jsx

@@ -1,12 +1,14 @@
 import React from "react";
+import { IoIosCall } from "react-icons/io";
+import { HiOutlineMail } from "react-icons/hi";
+import { TiLocation } from "react-icons/ti";
 import { AiOutlineInstagram } from "react-icons/ai";
 import { FaXTwitter } from "react-icons/fa6";
 import { FaLinkedinIn } from "react-icons/fa";
 import { FaFacebookF } from "react-icons/fa";
 import { BsYoutube } from "react-icons/bs";
 import { FaGithub } from "react-icons/fa";
 import { Link } from "react-router-dom";
-
 const Footer = () => {
   const currentYear = new Date().getFullYear();
   return (
@@ -22,8 +24,12 @@ const Footer = () => {
           <li>
             <Link to="/aboutus">About Us</Link>
           </li>
-          <li>Culture</li>
-          <li>Blog</li>
+          <li>
+            <Link to="/culture">Culture</Link>
+          </li>
+          <li>
+            <Link to="/blog">Blogs</Link>
+          </li>
           <li>
             <Link to="/terms">Terms and Policy</Link>
           </li>

frontend/src/components/PagenotFound.jsx

@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
 export default function PagenotFound() {
     return (
     <div className="center">
-        <img src={pic} alt="404 pic" class="pic"/>
+        <img src={pic} alt="404 pic" className="pic"/>
         <button className="btn"><Link to="/">Go Back</Link></button>
     </div>
     )

frontend/src/pages/Terms.jsx

@@ -6,7 +6,7 @@ const Terms = () => {
       <div className="mx-auto max-w-2xl px-4 py-8">
         <h1 className="text-4xl font-bold mb-8 text-white text-center">
           Terms and Conditions
-          <div class="divider md:h-[1.5px] sm:h-[1px] my-2"></div>
+          <div className="divider md:h-[1.5px] sm:h-[1px] my-2"></div>
         </h1>
 
         <p className="mt-4 mb-8 text-slate-200">