fix(landing): resolve merge conflict

benefits/core/templates/core/landing.html

@@ -19,15 +19,10 @@ <h1 class="text-left p-0 ">
             {% block headline %}
             {% endblock headline %}
           </h1>
-<<<<<<< HEAD
-          <h2 class="h2-sm pt-1 pt-lg-5 pb-4 pb-lg-5 mb-lg-2">
+          <h2 class="h2-sm-p pt-1 pt-lg-5 pb-4 pb-lg-5 mb-lg-2">
             {% translate "Cal-ITP Benefits connects your transit benefit to your contactless card" %}
           </h2>
           <span role="img" aria-label="{% translate "A person holds a contactless debit card next to a card reader on a bus." %}"></span>
-=======
-          <h2 class="h2-sm-p pt-1 pt-lg-5 pb-4 pb-lg-5 mb-lg-2">{% translate "core.pages.landing.h2" %}</h2>
-          <span role="img" aria-label="{% translate "core.pages.index.alt" %}"></span>
->>>>>>> 26fe9477 (fix(css): replace p-sm with h2-sm, renamed class)
           {% block call-to-action %}
           {% endblock call-to-action %}
         </div>