diff --git a/public/templates/bootstrap/account/transactions/default.tpl b/public/templates/bootstrap/account/transactions/default.tpl
index bdc8540c..18974a1e 100755
--- a/public/templates/bootstrap/account/transactions/default.tpl
+++ b/public/templates/bootstrap/account/transactions/default.tpl
@@ -37,13 +37,12 @@
         <i class="fa fa-search fa-fw"></i> Transaction Filter
       </div>
       <div class="panel-body">
-      
         <form action="{$smarty.server.SCRIPT_NAME}" role="form">
           <input type="hidden" name="page" value="{$smarty.request.page|escape}" />
           <input type="hidden" name="action" value="{$smarty.request.action|escape}" />
             <ul class="pager">
               <li class="previous {if $smarty.get.start <= 0}disabled{/if}">
-                <a href="{if $smarty.get.start <= 0}#{else}{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&start={$smarty.request.start|escape|default:"0" - $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}{/if}">&larr; Prev</a>
+                <a href="{if $smarty.get.start|default:"0" <= 0}#{else}{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&start={$smarty.request.start|escape|default:"0" - $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}{/if}">&larr; Prev</a>
               </li>
               <li class="next">
                 <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&start={$smarty.request.start|escape|default:"0" + $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}">Next &rarr;</a>
@@ -122,4 +121,4 @@
       </div>
     </div>
   </div>
-<div
\ No newline at end of file
+<div
diff --git a/public/templates/bootstrap/admin/transactions/default.tpl b/public/templates/bootstrap/admin/transactions/default.tpl
index 93a28283..39dec1f3 100755
--- a/public/templates/bootstrap/admin/transactions/default.tpl
+++ b/public/templates/bootstrap/admin/transactions/default.tpl
@@ -42,7 +42,11 @@
           <input type="hidden" name="action" value="{$smarty.request.action|escape}" />
             <ul class="pager">
               <li class="previous {if $smarty.get.start <= 0}disabled{/if}">
+<<<<<<< HEAD
                 <a href="{if $smarty.get.start <= 0}#{else}{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&start={$smarty.request.start|escape|default:"0" - $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}{/if}">&larr; Prev</a>
+=======
+                <a href="{if $smarty.get.start|default:"0" <= 0}#{else}{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&start={$smarty.request.start|escape|default:"0" - $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}{/if}">&larr; Prev</a>
+>>>>>>> 3139333a3d84d1aa3053a0806a7e32e11bbbaa49
               </li>
               <li class="next">
                 <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&start={$smarty.request.start|escape|default:"0" + $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}">Next &rarr;</a>
@@ -50,7 +54,7 @@
             </ul>
           <div class="form-group">
             <label>Type</label>
-            {html_options class="form-control" name="filter[type]" options=$TRANSACTIONTYPES selected=$smarty.request.filter.type|default:""}
+            {html_options class="form-control select2-bootstrap-append" name="filter[type]" options=$TRANSACTIONTYPES selected=$smarty.request.filter.type|default:""}
           </div>
           <div class="form-group">
             <label>Status</label>
@@ -130,4 +134,4 @@
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>