diff --git a/src/App.jsx b/src/App.jsx
index 1f20926..064be53 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,12 +1,5 @@
-<<<<<<< HEAD
 import { Navbar, Team, ContactUs, Footer } from "./components";
 
-=======
-import Navbar from "./components/NavBar/NavBar";
-import Footer from "./components/footer/Footer";
-import Team from "./components/team/Team";
-import ContactUs from "./components/contact/ContactUs";
->>>>>>> team/initial-design
 function App() {
   return (
     <div>
diff --git a/src/assets/2023 Core Team Pic/Aditya Shaw.png b/src/assets/coreTeamPictures/Aditya Shaw.png
similarity index 100%
rename from src/assets/2023 Core Team Pic/Aditya Shaw.png
rename to src/assets/coreTeamPictures/Aditya Shaw.png
diff --git a/src/assets/2023 Core Team Pic/Anirban Sinha.png b/src/assets/coreTeamPictures/Anirban Sinha.png
similarity index 100%
rename from src/assets/2023 Core Team Pic/Anirban Sinha.png
rename to src/assets/coreTeamPictures/Anirban Sinha.png
diff --git a/src/assets/2023 Core Team Pic/Arnab Chatterjee.png b/src/assets/coreTeamPictures/Arnab Chatterjee.png
similarity index 100%
rename from src/assets/2023 Core Team Pic/Arnab Chatterjee.png
rename to src/assets/coreTeamPictures/Arnab Chatterjee.png
diff --git a/src/assets/2023 Core Team Pic/Bhumi Sinha.png b/src/assets/coreTeamPictures/Bhumi Sinha.png
similarity index 100%
rename from src/assets/2023 Core Team Pic/Bhumi Sinha.png
rename to src/assets/coreTeamPictures/Bhumi Sinha.png
diff --git a/src/assets/2023 Core Team Pic/Bikash Agawala.png b/src/assets/coreTeamPictures/Bikash Agawala.png
similarity index 100%
rename from src/assets/2023 Core Team Pic/Bikash Agawala.png
rename to src/assets/coreTeamPictures/Bikash Agawala.png
diff --git a/src/assets/2023 Core Team Pic/Bishal Bhattacharjee.png b/src/assets/coreTeamPictures/Bishal Bhattacharjee.png
similarity index 100%
rename from src/assets/2023 Core Team Pic/Bishal Bhattacharjee.png
rename to src/assets/coreTeamPictures/Bishal Bhattacharjee.png
diff --git a/src/assets/2023 Core Team Pic/Gourav Rajak.png b/src/assets/coreTeamPictures/Gourav Rajak.png
similarity index 100%
rename from src/assets/2023 Core Team Pic/Gourav Rajak.png
rename to src/assets/coreTeamPictures/Gourav Rajak.png
diff --git a/src/assets/2023 Core Team Pic/Jayanta Pandit.png b/src/assets/coreTeamPictures/Jayanta Pandit.png
similarity index 100%
rename from src/assets/2023 Core Team Pic/Jayanta Pandit.png
rename to src/assets/coreTeamPictures/Jayanta Pandit.png
diff --git a/src/assets/2023 Core Team Pic/MD AMIR KHAN.png b/src/assets/coreTeamPictures/MD AMIR KHAN.png
similarity index 100%
rename from src/assets/2023 Core Team Pic/MD AMIR KHAN.png
rename to src/assets/coreTeamPictures/MD AMIR KHAN.png
diff --git a/src/assets/2023 Core Team Pic/Moulina Pandey.png b/src/assets/coreTeamPictures/Moulina Pandey.png
similarity index 100%
rename from src/assets/2023 Core Team Pic/Moulina Pandey.png
rename to src/assets/coreTeamPictures/Moulina Pandey.png
diff --git a/src/assets/2023 Core Team Pic/Niraj Modi.PNG b/src/assets/coreTeamPictures/Niraj Modi.PNG
similarity index 100%
rename from src/assets/2023 Core Team Pic/Niraj Modi.PNG
rename to src/assets/coreTeamPictures/Niraj Modi.PNG
diff --git a/src/assets/2023 Core Team Pic/Riya Kumari.png b/src/assets/coreTeamPictures/Riya Kumari.png
similarity index 100%
rename from src/assets/2023 Core Team Pic/Riya Kumari.png
rename to src/assets/coreTeamPictures/Riya Kumari.png
diff --git a/src/assets/2023 Core Team Pic/Rounak Kayal.png b/src/assets/coreTeamPictures/Rounak Kayal.png
similarity index 100%
rename from src/assets/2023 Core Team Pic/Rounak Kayal.png
rename to src/assets/coreTeamPictures/Rounak Kayal.png
diff --git a/src/assets/2023 Core Team Pic/Shivam Kumar Shaw.png b/src/assets/coreTeamPictures/Shivam Kumar Shaw.png
similarity index 100%
rename from src/assets/2023 Core Team Pic/Shivam Kumar Shaw.png
rename to src/assets/coreTeamPictures/Shivam Kumar Shaw.png
diff --git a/src/assets/2023 Core Team Pic/contactus.png b/src/assets/coreTeamPictures/contactus.png
similarity index 100%
rename from src/assets/2023 Core Team Pic/contactus.png
rename to src/assets/coreTeamPictures/contactus.png
diff --git a/src/assets/2023 Core Team Pic/Rajdip Sinha.png b/src/assets/coreTeamPictures/rajdipSinha.png
similarity index 100%
rename from src/assets/2023 Core Team Pic/Rajdip Sinha.png
rename to src/assets/coreTeamPictures/rajdipSinha.png
diff --git a/src/components/ContactUs.jsx b/src/components/ContactUs.jsx
deleted file mode 100644
index df724de..0000000
--- a/src/components/ContactUs.jsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import contactus from "../assets/contactus.png";
-export default function ContactUs() {
-  return (
-    <div>
-      <div className="flex flex-col p-10 justify-evenly md:flex-row">
-        <img src={contactus} className="max-w-full" alt="Contact Us" />
-
-        <div className="md:pl-10">
-          <h1 className="text-black text-[4.875rem] font-semibold">
-            Get in Touch
-          </h1>
-          <h2 className="text-[#686868] text-[1.4375rem] font-semibold leading-normal font-inter">
-            If you have any questions or inquiries, feel free to ask us.
-          </h2>
-          <form className="flex flex-col">
-            <input
-              className="p-2 m-2 border-2 border-black rounded-lg md:w-1/3 lg:w-full"
-              type="text"
-              name="firstname"
-              placeholder="Your name.."
-            />
-            <input
-              className="p-2 m-2 border-2 border-black rounded-lg md:w-1/3 lg:w-full"
-              type="text"
-              name="email"
-              placeholder="Email"
-            />
-            <textarea
-              className="h-40 p-2 m-2 border-2 border-black rounded-lg md:w-1/3 lg:w-full"
-              name="Message"
-              placeholder="Message"
-            ></textarea>
-          </form>
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx
deleted file mode 100644
index bb82d8b..0000000
--- a/src/components/Footer.jsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React from "react";
-import { FaLinkedin, FaInstagram, FaTwitter } from "react-icons/fa";
-
-export default function Footer() {
-  return (
-    <div className="relative text-slate-600 bg-slate-950">
-      <div className="flex flex-col md:flex-row justify-between pt-4 ml-4 md:ml-[10rem] mr-4 md:mr-[10rem]">
-        <div className="mb-4 text-center md:text-left md:mb-0">
-          <p className="text-[#6D6D6D] text-base not-italic font-extrabold leading-[29.2px] uppercase">
-            Dive into the new world of in-house music
-          </p>
-          <p className="w-full md:w-[20vw] pt-4 text-[#6D6D6D] text-lg not-italic font-medium leading-[normal]">
-            Lorem ipsum dolor sit amet consectetur. At porttitor ut felis nisl
-            ultrices sed sit. Cras nibh quis et diam justo in. Sollicitudin enim
-            tincidunt eros mauris senectus neque.
-          </p>
-        </div>
-        <div className="mb-4 text-center md:text-left md:mb-0">
-          <p className="text-[#6D6D6D] text-base not-italic font-extrabold leading-[29.2px] uppercase">
-            VISIT
-          </p>
-          <ul className="w-full md:w-[20vw] text-[#6D6D6D] text-[32px] not-italic font-medium leading-[30.214px] tracking-[-1px]">
-            <li>
-              <a href="#">About</a>
-            </li>
-            <li>
-              <a href="#">Events</a>
-            </li>
-            <li>
-              <a href="#">Get in touch</a>
-            </li>
-          </ul>
-        </div>
-        <div className="text-center md:text-left">
-          <p className="text-[#6D6D6D] text-base not-italic font-extrabold leading-[29.2px] uppercase">
-            SOCIALS
-          </p>
-          <ul className="flex justify-center gap-3 md:justify-start">
-            <li>
-              <FaInstagram size="3em" />
-            </li>
-            <li>
-              <FaTwitter size="3em" />
-            </li>
-            <li>
-              <FaLinkedin size="3em" />
-            </li>
-          </ul>
-        </div>
-      </div>
-      <div className="text-center md:text-left text-[15vw] text-[#6D6D6D] relative md:pl-[7rem] font-medium font-family: Poppins">
-        GDSC AEC
-      </div>
-    </div>
-  );
-}
diff --git a/src/components/NavBar.jsx b/src/components/NavBar.jsx
index 6fc8b2d..3e0df5b 100644
--- a/src/components/NavBar.jsx
+++ b/src/components/NavBar.jsx
@@ -1,10 +1,5 @@
-<<<<<<< HEAD:src/components/NavBar.jsx
-import React from 'react'
-import Logo from '../assets/gdsc-logo.png'
-=======
 import React from "react";
-import Logo from "../../assets/gdsc-logo.png";
->>>>>>> team/initial-design:src/components/NavBar/NavBar.jsx
+import Logo from "../assets/gdsc-logo.png";
 const Navbar = () => {
   return (
     <div className="w-[100%]  flex justify-center items-center py-6 relative">
diff --git a/src/components/contact/ContactUs.jsx b/src/components/contact/ContactUs.jsx
index 6d7e8c8..f93afb5 100644
--- a/src/components/contact/ContactUs.jsx
+++ b/src/components/contact/ContactUs.jsx
@@ -1,5 +1,6 @@
 import contactus from "../../assets/contactus.png";
 export default function ContactUs() {
+  const contactUsHandler = (e) => {};
   return (
     <div className="flex flex-col p-10 pt-[10rem] pb-[10rem] justify-evenly md:flex-row">
       <img src={contactus} className="max-w-full" alt="Contact Us" />
@@ -29,6 +30,12 @@ export default function ContactUs() {
             name="Message"
             placeholder="Message"
           ></textarea>
+          <input
+            className="bg-blue-700 w-[13.6875rem] h-[3.75rem] m-4 rounded-3xl text-white text-[1.375] "
+            type="submit"
+            value="Submit"
+            onClick={contactUsHandler}
+          />
         </form>
       </div>
     </div>
diff --git a/src/components/index.js b/src/components/index.js
index 9070884..8d07b3e 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,6 +1,6 @@
-import Navbar from './NavBar'
-import Team from './team/Team'
-import ContactUs from './ContactUs'
-import Footer from './Footer'
+import Navbar from "./NavBar";
+import Team from "./team/Team";
+import ContactUs from "./contact/ContactUs";
+import Footer from "./footer/Footer";
 
-export { Navbar, Team, ContactUs, Footer }
\ No newline at end of file
+export { Navbar, Team, ContactUs, Footer };
diff --git a/src/components/team/Card.jsx b/src/components/team/Card.jsx
index 0525635..0928d48 100644
--- a/src/components/team/Card.jsx
+++ b/src/components/team/Card.jsx
@@ -8,6 +8,7 @@ export default function Card({
   twitter,
   colour,
 }) {
+  console.log(image);
   console.log(colour);
   const className = `flex flex-col m-6 justify-center gap-2 items-center shadow-[0px_0px_15px_2px_rgba(0,0,0,0.17)] border-b-8 border-b-[${colour}] border-solid
   w-[18rem] h-[22rem] shrink-0`;
diff --git a/src/data/data2023.json b/src/data/data2023.json
index 1ffee6e..98b21e2 100644
--- a/src/data/data2023.json
+++ b/src/data/data2023.json
@@ -106,7 +106,8 @@
             "githubUrl": "http://github.com/rajdips834",
             "twitterUrl": "https://x.com/rajdips834?t=K0E58jxs0sleVQUDzLAvjw&s=09",
             "websiteUrl": "",
-            "roleType": 3
+            "roleType": 3,
+            "image":"../../assets/coreTeamPictures/rajdipSinha.png"
         },
         {
             "name": "Shivam kumar shaw",