diff --git a/static/JS/login.js b/static/JS/login.js
new file mode 100644
index 0000000000000000000000000000000000000000..075f71bc908f08db7904eaaeaa5664aa29989596
--- /dev/null
+++ b/static/JS/login.js
@@ -0,0 +1,7 @@
+function onLoad() {
+    document.getElementById('loginButton').addEventListener('click', clickLogin)
+}
+
+function clickLogin() {
+    
+}
\ No newline at end of file
diff --git a/static/login.html b/static/login.html
index 5bbe1b72a5529fc7b8b0ff4c1c3fa16cd0b44f59..7ae1a4d124a9acf95bd1d5de8f081c4bc4266084 100644
--- a/static/login.html
+++ b/static/login.html
@@ -25,21 +25,13 @@
         <form>
             <!-- Email input -->
             <div class="form-outline mb-4">
-<<<<<<< HEAD
                 <input type="email" id="recordEmail" class="form-control" />
-=======
-                <input type="email" id="form2Example1" class="form-control" />
->>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
                 <label class="form-label" for="form2Example1">Email address</label>
             </div>
   
             <!-- Password input -->
             <div class="form-outline mb-4">
-<<<<<<< HEAD
                 <input type="password" id="recordPassword" class="form-control" />
-=======
-                <input type="password" id="form2Example2" class="form-control" />
->>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
                 <label class="form-label" for="form2Example2">Password</label>
             </div>
   
@@ -59,7 +51,7 @@
             </div>
   
             <!-- Submit button -->
-            <button onclick="window.location.href='landingpage.html';" type="button" class="btn btn-light">
+            <button onclick="window.location.href='landingpage.html';" type="button" class="btn btn-light" id="loginButton">
                 <span class="spinner-grow spinner-grow-sm"></span>
                 Sign in
             </button>
@@ -68,8 +60,4 @@
             <p>Not a member? <a href="#!">Register</a></p>
         </form>
     </body>
-<<<<<<< HEAD
 </html>
-=======
-</html>
->>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239