diff --git a/templates/index.html b/templates/index.html
index 4f8e706..efc30b2 100755
--- a/templates/index.html
+++ b/templates/index.html
@@ -13,7 +13,7 @@
       <h3>See Leaderboards</h3>
       <p>
         Disclaimer: This reads commits from git log and may not match
-        commits from Github insights.
+        commits from Github insights. Reads only main branch.
       </p>
       <p>
         Additionally, any commits made through the Github web interface are ignored. Its recommended you set your git
@@ -35,29 +35,7 @@
   <footer class="footer flex-container-c">
     <div class="flex-container-r">
       <div>
-<<<<<<< HEAD
-        <h1 class="title">COMP 2800 Slacker</h1>
-        <h3>See Leaderboards</h3>
-        <p>
-            Disclaimer: This reads commits from git log and may not match
-            commits from Github insights. It only reads from MAIN branch.
-        </p>
-        <p>    
-          Any commits made through the Github web interface are ignored.
-        </p>
-        <p>
-          Files with matching patterns may be ignored in your commits. E.g. node_module files.
-        </p>
-        <ul>
-          <li><a class="link" href="/boards/TopContributorsAllTime">Top Contributor of All</a></li>
-          <li><a class="link" href="/boards/TopContributorPerCampus">Top Contributor per Campus</a></li>
-          <li><a class="link" href="/boards/TopContributorsPerTeam">Top Contributor per Team</a></li>
-          <li><a class="link" href="/boards/LargestProjectAllTeams">Largest Project of All</a></li>
-          <li><a class="link" href="/boards/LargestProjectsPerCampus">Largest Project per Campus</a></li>
-        </ul>
-=======
         <p><a href="https://sowinski.dev">sowinski.dev</a></p>
->>>>>>> 1d70bb505338d251dca61e83a97a39465c963d7b
       </div>
       <div class="social-icons">
         <a class="icon" href="https://www.linkedin.com/in/SowinskiBraeden" target=_blank rel="noopener noreferrer me"