resolving conflict

Author: MishtiGarg250

src/components/layout/Footer.jsx

@@ -1,7 +1,7 @@
 'use client';
 import { IMAGE_PATHS, SOCIAL_LINKS } from '@/lib/constants';
 import { motion } from 'framer-motion';
-import { ArrowUp, Mail, } from 'lucide-react';
+import { ArrowUp, Mail,Twitter, Instagram ,Facebook} from 'lucide-react';
 import Image from 'next/image';
 
 const SocialIcon = ({ href, Icon, delay, label }) => (
@@ -65,14 +65,7 @@ export default function Footer() {
                 Empowering students through collaborative coding
               </p>
             </div>
-            <motion.div
-              initial={{ opacity: 0, y: 10 }}
-              whileInView={{ opacity: 1, y: 0 }}
-              viewport={{ once: true }}
-              transition={{ delay: 0.2 }}
-            >
-              <DownloadBrochureButton variant="outline" size="default" />
-            </motion.div>
+            
           </motion.div>
 
           <div className="flex flex-col gap-6 md:items-end">

src/components/sections/HeroSection.jsx

@@ -19,7 +19,7 @@ export default function HeroSection() {
     >
       <div className="container-custom relative z-10">
         <div
-          className="absolute top-6 right-6 hidden md:flex items-center gap-3 z-30"
+          className="absolute top-0 right-5 hidden md:flex items-center gap-3 z-30"
           style={{
             background: 'rgba(255,255,255,0.04)',
             border: '1px solid rgba(255,255,255,0.06)',