diff --git a/home/index.js b/home/index.js
index 13352f2..d56823a 100644
--- a/home/index.js
+++ b/home/index.js
@@ -130,10 +130,13 @@ console.log(members);
 
 
                 })
+<<<<<<< HEAD
+=======
 
                 console.log(socialLinks);
                 
 
+>>>>>>> 14eb0996df0ecaca8d3e9460b75a517392948f27
                 let socialIconsVisibility = document.querySelectorAll("#memberInfoModal > div > div.social > a")
 
                 if (Auth.isLoggedIn == false) {
@@ -211,6 +214,7 @@ function configureNavButtons() {
 
     const navMemberSelect = document.getElementById("type");
     const beMemberDropdown = document.getElementsByClassName("beMember")[1];
+    const navMemberSelect = document.getElementById("type");
 
     const urlParams = new URLSearchParams(window.location.search);
     const memberType = urlParams.get('type');
@@ -219,7 +223,11 @@ function configureNavButtons() {
     if (memberType == 'mentees') {
         memberRef = db.collection("mentees");
         pageTitle.innerText = "Mentees"
+<<<<<<< HEAD
+        beMember.innerHTML = 'Be a Mentee'
+=======
         beMember[0].innerHTML = 'Be a Mentee'
+>>>>>>> 14eb0996df0ecaca8d3e9460b75a517392948f27
         navMemberSelect.href = "index.html?type=mentors"
     } else {
         memberRef = db.collection("mentors");
diff --git a/home/style.css b/home/style.css
index f52cc5b..1befcfa 100644
--- a/home/style.css
+++ b/home/style.css
@@ -2,8 +2,12 @@ nav {
     box-shadow: none;
 }
 
+<<<<<<< HEAD
+nav ul a,.loginBtn {
+=======
 
 /* nav ul a {
+>>>>>>> 14eb0996df0ecaca8d3e9460b75a517392948f27
   color: #f44336;
   font-size: 15px;
 } */
@@ -54,6 +58,12 @@ nav ul a,
     font-weight: 500;
 }
 
+.loginBtn, .loginBtn:hover {
+  font-weight: 700;
+  border: 0;
+  background: transparent;
+}
+
 .modal-content ul li a {
     color: white;
     background-color: #f44336;
@@ -121,6 +131,11 @@ p.location {
 }
 
 @media only screen and (max-width: 600px) {
+<<<<<<< HEAD
+  .valign-wrapper {
+    display: block;
+  }
+=======
     .valign-wrapper {
         display: block;
     }
@@ -159,4 +174,5 @@ p.location {
     left: auto;
     right: 60px;
     /* margin-left: 40%; */
+>>>>>>> 14eb0996df0ecaca8d3e9460b75a517392948f27
 }
\ No newline at end of file