diff --git a/src/components/signup/Signup.css b/src/components/signup/Signup.css
index 07dba2d..6ad7557 100644
--- a/src/components/signup/Signup.css
+++ b/src/components/signup/Signup.css
@@ -32,6 +32,7 @@
 }
 
 
+<<<<<<< HEAD
 .scontent{
     display: flex;
     justify-content: center;
@@ -79,3 +80,5 @@
 
 
 
+=======
+>>>>>>> 8823b651373b5423cdf7c57224838b969736e12b
diff --git a/src/components/signup/Signup.jsx b/src/components/signup/Signup.jsx
index e775551..cc7f7dd 100644
--- a/src/components/signup/Signup.jsx
+++ b/src/components/signup/Signup.jsx
@@ -22,6 +22,14 @@ const Signup = () => {
 
             </div>
             
+<<<<<<< HEAD
+=======
+             <div className="s-content">
+              <div className="email">
+                Email: <input type="email"/> 
+              </div>
+             </div>
+>>>>>>> 8823b651373b5423cdf7c57224838b969736e12b