From d2fe40dce1e7b7b81660011686db1bacfe58fcf6 Mon Sep 17 00:00:00 2001
From: sarahhpeng <sarah.peng@berkeley.edu>
Date: Sat, 16 Mar 2024 16:39:02 -0700
Subject: [PATCH] fix: resolve conflict

---
 src/app/dummyPage/page.tsx | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 src/app/dummyPage/page.tsx

diff --git a/src/app/dummyPage/page.tsx b/src/app/dummyPage/page.tsx
new file mode 100644
index 0000000..31106fe
--- /dev/null
+++ b/src/app/dummyPage/page.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import EmailPopup from '../../components/userComponents/emailPopup/page';
+
+/**
+ * @returns email popup
+ */
+export default function Home() {
+  return (
+    <EmailPopup
+    />
+  );
+}
\ No newline at end of file