I've been looking at this all day...and have isolated my 'merging woes' down to the following snippets (I really hope this isn't an imposition ...)

line 23 (orig file)

PHP Code:
<<div class="text_v_c"><?php echo TEXT_VISITORS_CART; ?></div>
mod's file

PHP Code:
<div class="forward"><?php echo TEXT_VISITORS_CART; ?></div>
line 59 (orig file)

PHP Code:
        <th scope="col" id="scRemoveHeading"><?php echo TABLE_HEADING_REMOVE; ?></th>
mod's file
PHP Code:
        <th scope="col" id="scRemoveHeading">&nbsp;</th> 
line 74 (orig file)
PHP Code:
<div class="buttonRow"> 
mod's file

PHP Code:
       </td>
       <td class="cartQuantityUpdate"> 
line 126 (orig file)
PHP Code:
?></div> 
Mod's file
PHP Code:
  if ($product['checkBoxDelete'] ) {
    echo zen_draw_checkbox_field('cart_delete[]', $product['id']);
  }
?> 
Line 138 orig file
PHP Code:
<div id="cartSubTotal"><?php echo SUB_TITLE_SUB_TOTAL; ?> <strong><?php echo $cartShowTotal; ?></strong></div>
mod's file
PHP Code:
<div id="cartSubTotal"><?php echo SUB_TITLE_SUB_TOTAL; ?> <?php echo $cartShowTotal; ?></div>
I hope that someone can enlighten me - thank you so much