diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
index 50d1d2669c..2b1944a043 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
@@ -88,7 +88,7 @@ fieldset.rows .itemblock fieldset.action { padding:.5em; }
             <!-- /TMPL_LOOP -->
             </select></li>
    <!-- /TMPL_IF -->
-   </ol><!-- TMPL_VAR name="itemBlockIndex" -->
+   </ol>
 <fieldset class="action"><a href="#" class="cloneItemBlock">[+]</a>
  <a href="#" class="deleteItemBlock">[-]</a></fieldset>
     </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index 70c1826af5..8489c43418 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -289,10 +289,7 @@ $.tablesorter.addParser({
           <!-- /TMPL_IF -->
         </form>
       <!-- /TMPL_IF -->&nbsp;
-<<<<<<< HEAD:koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
-=======
       <a href="#" class="send" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelf" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100')">Send List</a>
->>>>>>> ffa3c9a... Markup and style corrections.:koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
     </td>
 		</tr>
             <!-- /TMPL_LOOP -->