diff --git a/static/register.html b/static/register.html
index a67eab6..755252d 100644
--- a/static/register.html
+++ b/static/register.html
@@ -12,13 +12,8 @@
     <div class="d-flex p-2 justify-content-center align-items-center">
     <form method="post">
       <div class="mb-3">
-<<<<<<< HEAD
-        <label for="exampleInputEmail1" class="form-label">Email address</label>
-        <input type="email" class="form-control" id="exampleInputEmail1" aria-describedby="emailHelp" required>
-=======
         <label for="email" class="form-label">Email address</label>
-        <input type="email" class="form-control" id="email" name="email" aria-describedby="emailHelp">
->>>>>>> c160c57da5e2a70b406ce21fd0d3b48efdc62b36
+        <input type="email" class="form-control" id="email" name="email" aria-describedby="emailHelp" required>
         <div id="emailHelp" class="form-text">We'll never share your email with anyone else.</div>
       </div>
       <div class="mb-3">