diff --git a/app/Views/address_pdf_landscape_template.php b/app/Views/address_pdf_landscape_template.php
index 79d2891e..2a3bff7e 100755
--- a/app/Views/address_pdf_landscape_template.php
+++ b/app/Views/address_pdf_landscape_template.php
@@ -19,11 +19,13 @@
         }
         .from-address, .to-address {
             margin-bottom: 20px;
+            
         }
         .from-address {
             text-align: left;
             float: left;
             width: 100%;
+            font-size: small;
         }
         .to-address {
 
@@ -38,7 +40,6 @@
 
 <?php foreach ($invoiceData as $value): ?>
     <div class="label-container">
-<<<<<<< HEAD
             <table width="100%" style="border-collapse: collapse;">
                 <tr>
                     <td width="30%" style="text-align: left;"><strong>From :</strong></td>
@@ -71,37 +72,6 @@
                 <?= $value->mobile_no ? "Mobile : " . $value->mobile_no . " ." : "" ?>
             </div>
             <div style="clear: both;"></div>
-=======
-        <!-- From Address on the left -->
-        <div style="font-size: small;" class="from-address">
-            <strong>From :</strong><br>
-            <?= $value->company_name; ?><br>
-            <?= $value->company_address . ","; ?><br>
-            <?= $value->company_city; ?> - <?= $value->company_postal_code . ","; ?><br>
-            <?= $value->company_state . "."; ?><br>
-            <?= $value->company_mobile_no; ?>
-        </div>
-        <!-- Order Number on the right -->
-        <div class="order-number">
-            <b> Order : </b><?php echo $value->invoice_number; ?>
-        </div>
-        <!-- To Address -->
-        <div  class="to-address">
-        <strong class="ltr">To :</strong><br>
-        <span style="text-align: jus;" class="ltr"><?= htmlspecialchars($value->customer_name) ?></span><br>
-        <?php if ($value->customer_ship_address && ($value->saddr_id !== null || $value->saddr_id !== '')): ?>
-            <span class="ltr"><?= htmlspecialchars($value->customer_ship_address) ? htmlspecialchars($value->customer_ship_address) . " , <br>" : "" ?></span>
-            <span class="ltr"><?= htmlspecialchars($value->customer_ship_city) ? htmlspecialchars($value->customer_ship_city) . "&nbsp;" : "" ?></span>
-            <span class="ltr"><?= htmlspecialchars($value->customer_ship_postal_code) ? " - " . htmlspecialchars($value->customer_ship_postal_code) . "<br>" : "" ?></span>
-            <span class="ltr"><?= htmlspecialchars($value->customer_ship_state) ? htmlspecialchars($value->customer_ship_state) . ". <br>" : "" ?></span>
-        <?php elseif ($value->saddr_id === null || $value->saddr_id === ''): ?>
-            <span class="ltr"><?= htmlspecialchars($value->shipping_address) ? htmlspecialchars($value->shipping_address) . '<br>' : '' ?></span>
-        <?php endif; ?>
-        <span class="ltr"><?= htmlspecialchars($value->mobile_no) ? "Mobile : " . htmlspecialchars($value->mobile_no) . " ." : "" ?></span>
-    </div>
-        <div style="clear: both;"></div>
-
->>>>>>> 37dc008a4e67eb19b144ea570725193f87907964
     </div>
 <?php endforeach; ?>
 </body>