Remove git conflict from code (#54)

Author: jeff-allen-mongo

docs-tools

@@ -380,7 +380,6 @@ <h4 class="block__title">
           </div>
         </div>
 
-<<<<<<< HEAD
         <div class="col-3 no-left-gutter">
          <div class="block">
            <h3 class="block__header">MongoDB Shell</h3>
@@ -415,31 +414,6 @@ <h4 class="block__title">
             </h4>
           </div>
          </div>
-=======
-       </div>
-
-     <div class="row">  
-       <div class="col-3 no-left-gutter">
-        <div class="block">
-          <h3 class="block__header">MongoDB Spark Connector</h3>
-          <h4 class="block__title">
-            <a class="block__link" href="https://docs.mongodb.com/spark-connector/current/scala-api/">Scala Guide</a>
-          </h4>
-          <h4 class="block__title">
-            <a class="block__link" href="https://docs.mongodb.com/spark-connector/current/java-api/">Java Guide</a>
-          </h4>
-          <h4 class="block__title">
-            <a class="block__link" href="https://docs.mongodb.com/spark-connector/current/python-api/">Python Guide</a>
-          </h4>
-          <h4 class="block__title">
-            <a class="block__link" href="https://docs.mongodb.com/spark-connector/current/r-api/">R Guide</a>
-          </h4>
-        </div>
-      
-       </div>
-
-
->>>>>>> (DOCSP-10690): Add Community Operator to menu/landing page
 
          <div class="col-3 no-left-gutter">
           <div class="block">
@@ -456,7 +430,7 @@ <h4 class="block__title">
           </div>
         </div>
       </div>
-    </div>
+    </div> 
     </div>
   </div>
 </div>