fix: conflicts resolved

Signed-off-by: Varun Raj <varun@skcript.com>

remotion/Root.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Composition } from 'remotion';
 import { IntroComposition, Scene } from './Composition';
 
-const scenes: Scene[] = [
+export const scenes: Scene[] = [
   { message: "Welcome Varun!",
     type: "WELCOME",
     emoji: "👋",

src/pages/rewind.tsx

@@ -109,8 +109,10 @@ export default function RewindPage() {
 
   return (
     <PageLayout>
-      <Header leftComponent="Rewind 2024" />
+      <div className="flex justify-center flex-col items-center w-full h-full gap-2">
-      <div className="flex justify-center items-center w-full h-full">
+        <p className='text-2xl font-bold'>
+          Your 2024 Rewind 🚀
+        </p>
         <Player
           className="rounded-lg"
           component={IntroComposition}