removing merge conflict attempt

src/components/Hero.jsx

@@ -5,10 +5,10 @@ import "./Hero.css";
 export default function ({ name }) {
   return (
     <div className="hero">
-      {/* <HeroAnimation
+      <HeroAnimation
         animationPath="/nyu-abu-dhabi/lottie-files/hero-optimized.json"
         speed={1}
-      /> */}
+      />
       <p className="heading">{name}</p>
     </div>
   );