diff --git a/public/index.html b/public/index.html
index 5f4371b..518aa04 100644
--- a/public/index.html
+++ b/public/index.html
@@ -33,15 +33,6 @@
                 </div>
                 <div class="nav-selector">
                     <a href="#" onclick="switchPage('events')">Events</a>
-<<<<<<< HEAD
-=======
-                </div>
-                <div class="nav-selector">
-                    <a href="#" onclick="switchPage('eboard')">E-Board</a>
-                </div>
-                <div class="nav-selector">
-                    <a href="#" onclick="switchPage('research')">Research</a>
->>>>>>> 5fde6ae (Added a research page with the format from roadmap)
                 </div>
                 <!--
                 <div class="nav-selector">
@@ -86,15 +77,6 @@
         </div>
         <div>
             <a class="sidenav-selector" href="#" onclick="switchPage('events')">Events</a>
-<<<<<<< HEAD
-=======
-        </div>
-        <div>
-            <a class="sidenav-selector" href="#" onclick="switchPage('eboard')">E-Board</a>
-        </div>
-        <div>
-            <a class="sidenav-selector" href="#" onclick="switchPage('research')">Research</a>
->>>>>>> 5fde6ae (Added a research page with the format from roadmap)
         </div>
         <!--
                 <div>
@@ -178,23 +160,20 @@ <h2> Professional Certificates and Experience </h2>
 
       <!--  Research Page -->
       <div id="research" class="page research-container">
-<<<<<<< HEAD
-<<<<<<< HEAD
+
         <h1 class="research-header">Wirless and Quantum Communication Research Group at SDSU</h1>
         <p class="research-subheader"> The WQCR Group focuses on Wireless and Quantum Communication Research. We work in small teams to apply quantum computing in areas such as telecommunications, UAV networks, satellite networks, and more! We have research positions available for both undergraduate and graduate students. To learn more contact the club president or faculty advisor.</p>
       </div>
-=======
         <!-- TODO: HAVING TROUBLE GETTING THE JSON NODES TO DISPLAY WITH THE STATIC TEXT!!!
         <h1 class="research-header">Wirless and Quantum Communication Research Lab @ SDSU</h1>
         <p class="research-subheader"> This page is dedicated to our new Quantum Research Lab at SDSU. The WQCR Lab focuses on exactly what you think it would from its title. Wireless and Quantum Communication Research.</p>
         -->
     </div>
->>>>>>> 5fde6ae (Added a research page with the format from roadmap)
-=======
+
         <h1 class="research-header">Wirless and Quantum Communication Research Lab @ SDSU</h1>
         <p class="research-subheader"> This page is dedicated to our new Quantum Research Lab at SDSU. The WQCR Lab focuses on exactly what you think it would from its title. Wireless and Quantum Communication Research.</p>
       </div>
->>>>>>> 037f8ae (fixed research text)
+