diff --git a/views/templates/front/credit_cards.tpl b/views/templates/front/credit_cards.tpl
index 16083a4b..887fb900 100755
--- a/views/templates/front/credit_cards.tpl
+++ b/views/templates/front/credit_cards.tpl
@@ -51,7 +51,11 @@
             </tr>
             </thead>
             {foreach $rows as $row}
+<<<<<<< HEAD
                 {$row|cleanHtml nofilter}
+=======
+                {$row nofilter|escape:'htmlall':'UTF-8'}
+>>>>>>> parent of 7e197ab (Merge pull request #190 from Invertus/SL-234/my-account-override)
             {/foreach}
         </table>
     </div>
diff --git a/views/templates/front/credit_cards_16.tpl b/views/templates/front/credit_cards_16.tpl
index af1140bf..8fac03a9 100755
--- a/views/templates/front/credit_cards_16.tpl
+++ b/views/templates/front/credit_cards_16.tpl
@@ -53,7 +53,11 @@
         </tr>
         </thead>
         {foreach $rows as $row}
+<<<<<<< HEAD
             {$row|cleanHtml nofilter}
+=======
+            {$row nofilter|escape:'htmlall':'UTF-8'}
+>>>>>>> parent of 7e197ab (Merge pull request #190 from Invertus/SL-234/my-account-override)
         {/foreach}
     </table>
 </div>