fix merge errors

diff --cc themes/baggy/_search-form.twig
index 77cd846102dda0cbc224f7f73b26c4c2d824c9da,b1e17dd8807fdc51a1793315958c515baebc7a0f..4add929427821718cb7d101161e18de05e08de63
--- 1/themes/baggy/_search-form.twig
--- 2/themes/baggy/_search-form.twig
+++ b/themes/baggy/_search-form.twig
@@@ -1,7 -1,7 +1,7 @@@
  <div id="search-form" class="messages info popup-form">
  <form method="get" action="index.php">
-         <h2>{%trans "Search" %}</h2>
-       <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
 -                              <h2>{%trans "Search" %}</h2>
++      <h2>{%trans "Search" %}</h2>
+         <a href="javascript: void(null);" id="search-form-close" class="popup-close">&times;</a>
          <input type="hidden" name="view" value="search"></input>
          <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield"><br>
          <input id="submit-search" type="submit" value="{% trans "Search" %}"></input>