Resolve merge conflicts with master

Author: hoaiandang

Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     uswds-jekyll (5.0.0)
-      jekyll (>= 4.0)
+      jekyll (>= 4.0, < 5)
 
 GEM
   remote: https://rubygems.org/

_includes/components/header.html

@@ -97,8 +97,9 @@
           {% if site.search_site_handle  %}
             {% include components/search.html %}
           {% endif %}
+        {% endif %}
 
-          {% if header.type == 'extended' or header.type == 'extended-mega' %}
+        {% if header.type == 'extended' or header.type == 'extended-mega' %}
           {% assign _secondary = header.secondary %}
           <div class="usa-nav__secondary">
             <ul class="usa-unstyled-list usa-nav__secondary-links">

_includes/components/search.html

@@ -1,10 +1,30 @@
-<form accept-charset="UTF-8" action="https://search.usa.gov/search" class="usa-search usa-search-small js-search-form" method="get">
-  <input name="utf8" type="hidden" value="&#x2713;"/>
-  <input id="affiliate" name="affiliate" type="hidden" value="{{ site.search_site_handle }}"/>
+<form
+  accept-charset="UTF-8"
+  action="https://search.usa.gov/search"
+  id="search_form"
+  method="get"
+  class="usa-search usa-search--small js-search-form">
+  <input
+    name="utf8"
+    type="hidden"
+    value="&#x2713;" />
+  <input
+    id="affiliate"
+    name="affiliate"
+    type="hidden"
+    value="{{ site.search_site_handle }}" />
   <div role="search">
-    <label class="usa-sr-only" for="query">Enter Search Term(s):</label>
-    <input autocomplete="off" class="usagov-search-autocomplete" id="query" name="query" type="search"/>
-    <button type="submit">
+    <label for="query" class="usa-sr-only">Enter Search Term(s):</label>
+    <input
+      autocomplete="off"
+      class="usa-input usagov-search-autocomplete"
+      id="query"
+      name="query"
+      type="search" />
+    <button
+      class="usa-button"
+      type="submit"
+      name="commit">
       <span class="usa-sr-only">Search</span>
     </button>
   </div>