diff --git a/pages/getting-started.html b/pages/getting-started.html
index 516e8b8bf2..dc2d4c73d7 100644
--- a/pages/getting-started.html
+++ b/pages/getting-started.html
@@ -91,12 +91,8 @@ <h2 class="getting-started-step-title-header">STEP 2: <strong>Join Your Communit
                         <svg class="step-img-icon-cop" viewBox="0 0 90 90">
                             {% include svg/icon-slack.svg %}
                         </svg>
-<<<<<<< HEAD
                         <li class="g-s-list">
                             <a href="/communities-of-practice" target="_blank">Join your Community of Practice</a> for access to announcements, meeting zoom links, and helpful resources.
-=======
-                        <li class="g-s-list"><a href="/communities-of-practice" target="_blank">Join your Community of Practice</a> for access to announcements, meeting zoom links, and helpful resources.
->>>>>>> ffce1980 (replaced img with svg icon. added css and tested in various view modes)
                         </li>
                     </div>
                 </br>