diff --git a/manager/bakery/bakery_stock_excel.php b/manager/bakery/bakery_stock_excel.php
index b27d579d8..9e6326fde 100644
--- a/manager/bakery/bakery_stock_excel.php
+++ b/manager/bakery/bakery_stock_excel.php
@@ -128,7 +128,6 @@ foreach ( $result as $row) {
     $previous_stock = getPrevStock($searchDate, $row['barcode']);
     ?>
     <tr>
-<<<<<<< HEAD
         <td><?=$row['product_name']?></td>
         <td><?=$row['barcode']?></td>
         <td><?=number_format($previous_stock)?></td>
@@ -142,21 +141,6 @@ foreach ( $result as $row) {
         <td><?=number_format($row['menu_discount'])?></td>
         <td><?=number_format($row['payment_amount'])?></td>
         <td><?=number_format($row['current_stock'])?></td>
-=======
-        <td class="line"><?=$row['product_name']?></td>
-        <td class="line"><?=$row['barcode']?></td>
-        <td class="line"><?=number_format(getPrevStock($searchDate, $row['barcode']))?></td>
-        <td class="line"><?=number_format($row['production'])?></td>
-        <td class="line"><?=number_format($row['inhouse_use'])?></td>
-        <td class="line"><?=number_format($row['recycling'])?></td>
-        <td class="line"><?=number_format($row['disposal'])?></td>
-        <td class="line"><?=number_format($row['sales'])?></td>
-        <td class="line"><?=($row['sales'] != 0 && $row['sales_amount'] != 0) ? number_format($row['sales_amount']/$row['sales']) : 0 ?></td>
-        <td class="line"><?=number_format($row['sales_amount'])?></td>
-        <td class="line"><?=number_format($row['menu_discount'])?></td>
-        <td class="line"><?=number_format($row['payment_amount'])?></td>
-        <td class="line"><?=number_format($row['current_stock'])?></td>
->>>>>>> manager
     </tr>
     <?php