diff --git a/app/Mail/SendEstimateMail.php b/app/Mail/SendEstimateMail.php
index 7261fdae..a88bc6c4 100644
--- a/app/Mail/SendEstimateMail.php
+++ b/app/Mail/SendEstimateMail.php
@@ -42,9 +42,15 @@ class SendEstimateMail extends Mailable
             'mailable_id' => $this->data['estimate']['id']
         ]);
 
+<<<<<<< HEAD
         $mailContent = $this->from($this->data['from'])
             ->subject($this->data['subject'])
             ->markdown('emails.send.estimate', ['data', $this->data]);
+=======
+        return $this->from($this->data['from'], config('mail.from.name'))
+                    ->subject($this->data['subject'])
+                    ->markdown('emails.send.estimate', ['data', $this->data]);
+>>>>>>> master
 
         if ($this->pdfData) {
             $mailContent->attachData(
diff --git a/app/Mail/SendInvoiceMail.php b/app/Mail/SendInvoiceMail.php
index 81eacd39..39846c52 100644
--- a/app/Mail/SendInvoiceMail.php
+++ b/app/Mail/SendInvoiceMail.php
@@ -1,6 +1,7 @@
 <?php
 namespace Crater\Mail;
 
+use Config;
 use Crater\Models\EmailLog;
 use Crater\Models\Invoice;
 use Illuminate\Bus\Queueable;
@@ -46,6 +47,7 @@ class SendInvoiceMail extends Mailable
             ->subject($this->data['subject'])
             ->markdown('emails.send.invoice', ['data', $this->data]);
 
+<<<<<<< HEAD
         if ($this->pdfData) {
             $mailContent->attachData(
                 $this->pdfData->output(), 
@@ -54,5 +56,10 @@ class SendInvoiceMail extends Mailable
         }
         
         return $mailContent;
+=======
+        return $this->from($this->data['from'], config('mail.from.name'))
+                    ->subject($this->data['subject'])
+                    ->markdown('emails.send.invoice', ['data', $this->data]);
+>>>>>>> master
     }
 }
diff --git a/app/Mail/SendPaymentMail.php b/app/Mail/SendPaymentMail.php
index 65279a13..ed0e5686 100644
--- a/app/Mail/SendPaymentMail.php
+++ b/app/Mail/SendPaymentMail.php
@@ -43,6 +43,7 @@ class SendPaymentMail extends Mailable
             'mailable_id' => $this->data['payment']['id']
         ]);
 
+<<<<<<< HEAD
         $mailContent = $this->from($this->data['from'])
             ->subject($this->data['subject'])
             ->markdown('emails.send.payment', ['data', $this->data]);
@@ -55,5 +56,11 @@ class SendPaymentMail extends Mailable
         }
         
         return $mailContent;
+=======
+        return $this->from($this->data['from'], config('mail.from.name'))
+                    ->subject($this->data['subject'])
+                    ->markdown('emails.send.payment', ['data', $this->data]);
+
+>>>>>>> master
     }
 }
diff --git a/database/seeders/CurrenciesTableSeeder.php b/database/seeders/CurrenciesTableSeeder.php
index be1fe6e5..2abed043 100644
--- a/database/seeders/CurrenciesTableSeeder.php
+++ b/database/seeders/CurrenciesTableSeeder.php
@@ -550,6 +550,15 @@ class CurrenciesTableSeeder extends Seeder
                 'thousand_separator' => ',',
                 'decimal_separator' => '.'
             ],
+            [
+                'name' => 'Peruvian Soles',
+                'code' => 'PEN',
+                'symbol' => 'S/',
+                'precision' => '2',
+                'thousand_separator' => ',',
+                'decimal_separator' => '.'
+            ],
+            
         ];
 
         foreach ($currencies as $currency) {
diff --git a/resources/views/app/pdf/invoice/invoice1.blade.php b/resources/views/app/pdf/invoice/invoice1.blade.php
index 0dd4bb1b..507b347a 100644
--- a/resources/views/app/pdf/invoice/invoice1.blade.php
+++ b/resources/views/app/pdf/invoice/invoice1.blade.php
@@ -215,7 +215,6 @@
 
         .total-display-table {
             border-top: none;
-            box-sizing: border-box;
             page-break-inside: avoid;
             page-break-before: auto;
             page-break-after: auto;
diff --git a/resources/views/app/pdf/invoice/invoice2.blade.php b/resources/views/app/pdf/invoice/invoice2.blade.php
index c19c4920..44771b61 100644
--- a/resources/views/app/pdf/invoice/invoice2.blade.php
+++ b/resources/views/app/pdf/invoice/invoice2.blade.php
@@ -256,7 +256,6 @@
         }
 
         .total-display-table {
-            box-sizing: border-box;
             page-break-inside: avoid;
             page-break-before: auto;
             page-break-after: auto;
diff --git a/resources/views/app/pdf/invoice/invoice3.blade.php b/resources/views/app/pdf/invoice/invoice3.blade.php
index c06bae3e..d6298fa8 100644
--- a/resources/views/app/pdf/invoice/invoice3.blade.php
+++ b/resources/views/app/pdf/invoice/invoice3.blade.php
@@ -185,7 +185,6 @@
 
 
         .total-display-table {
-            box-sizing: border-box;
             page-break-inside: avoid;
             page-break-before: auto;
             page-break-after: auto;
diff --git a/resources/views/app/pdf/payment/payment.blade.php b/resources/views/app/pdf/payment/payment.blade.php
index f5dd5729..14440412 100644
--- a/resources/views/app/pdf/payment/payment.blade.php
+++ b/resources/views/app/pdf/payment/payment.blade.php
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <html>
+
 <head>
     <title>Payment</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
     <style type="text/css">
         /* -- Base -- */
@@ -15,13 +16,14 @@
             padding: 0px;
             margin-top: 50px;
         }
+
         table {
             border-collapse: collapse;
         }
 
         hr {
-           color: rgba(0, 0, 0, 0.2);
-           border: 0.5px solid #EAF1FB;
+            color: rgba(0, 0, 0, 0.2);
+            border: 0.5px solid #EAF1FB;
         }
 
         /* -- Heeader -- */
@@ -51,12 +53,14 @@
             color: #817AE3;
             padding-top: 0px;
         }
+
         .company-address-container {
             width: 50%;
             text-transform: capitalize;
             padding-left: 80px;
             margin-bottom: 2px;
         }
+
         /* .header-section-right {
             display:inline-block;
             position: absolute;
@@ -77,7 +81,7 @@
         /* -- Company Address -- */
 
         .company-details h1 {
-            margin:0;
+            margin: 0;
 
             font-weight: bold;
             font-size: 15px;
@@ -87,8 +91,8 @@
             max-width: 220px;
         }
 
-        .company-address{
-             /* margin-top: 12px; */
+        .company-address {
+            /* margin-top: 12px; */
             font-size: 12px;
             line-height: 15px;
             color: #595959;
@@ -96,8 +100,8 @@
         }
 
         .content-wrapper {
-           display: block;
-           height: 200px;
+            display: block;
+            height: 200px;
         }
 
         .main-content {
@@ -108,8 +112,8 @@
         /* -- Customer Address -- */
         .customer-address-container {
             display: block;
-            float:left;
-            width:40%;
+            float: left;
+            width: 40%;
             padding: 0 0 0 30px;
         }
 
@@ -167,7 +171,7 @@
             font-size: 10px;
             line-height: 15px;
             color: #595959;
-            margin:0px;
+            margin: 0px;
             width: 180px;
             word-wrap: break-word;
         }
@@ -226,7 +230,7 @@
 
         p {
             padding: 0 0 0 0;
-            margin:  0 0 0 0;
+            margin: 0 0 0 0;
         }
 
         .content-heading span {
@@ -258,7 +262,7 @@
             color: #595959;
         }
 
-        .total-display-box span {
+        .total-display-box .amount {
             float: right;
             font-weight: bold;
             font-size: 14px;
@@ -268,21 +272,22 @@
         }
     </style>
 </head>
+
 <body>
     <div class="header-container">
         <table width="100%">
             <tr>
                 @if($logo)
-                    <td  width="50%" class="header-section-left">
-                        <img class="header-logo" src="{{ $logo }}" alt="Company Logo">
-                @else
+                <td width="50%" class="header-section-left">
+                    <img class="header-logo" src="{{ $logo }}" alt="Company Logo">
+                    @else
                     @if($payment->user->company)
-                    <td class="header-section-left" style="padding-top:0px;">
-                        <h1 class="header-logo"> {{$payment->user->company->name}} </h1>
+                <td class="header-section-left" style="padding-top:0px;">
+                    <h1 class="header-logo"> {{$payment->user->company->name}} </h1>
+                    @endif
                     @endif
-                @endif
                 </td>
-                <td  width="50%" class="header-section-right company-details company-address">
+                <td width="50%" class="header-section-right company-details company-address">
                     {!! $company_address !!}
                 </td>
             </tr>
@@ -300,8 +305,8 @@
             <div class="customer-address-container">
                 <div class="billing-address-container billing-address">
                     @if($billing_address)
-                        @lang('pdf_received_from')
-                        {!! $billing_address !!}
+                    @lang('pdf_received_from')
+                    {!! $billing_address !!}
                     @endif
                 </div>
                 <div class="billing-address-container--right">
@@ -324,10 +329,10 @@
                         <td class="attribute-value"> &nbsp;{{$payment->paymentMethod ? $payment->paymentMethod->name : '-'}}</td>
                     </tr>
                     @if ($payment->invoice && $payment->invoice->invoice_number)
-                        <tr>
-                            <td class="attribute-label">@lang('pdf_invoice_label')</td>
-                            <td class="attribute-value"> &nbsp;{{$payment->invoice->invoice_number}}</td>
-                        </tr>
+                    <tr>
+                        <td class="attribute-label">@lang('pdf_invoice_label')</td>
+                        <td class="attribute-value"> &nbsp;{{$payment->invoice->invoice_number}}</td>
+                    </tr>
                     @endif
                 </table>
             </div>
@@ -336,7 +341,8 @@
     </div>
     <div class="total-display-box">
         <p class="total-display-label">@lang('pdf_payment_amount_received_label')</p>
-        <span>{!! format_money_pdf($payment->amount, $payment->user->currency) !!}</span>
+        <span class="amount">{!! format_money_pdf($payment->amount, $payment->user->currency) !!}</span>
     </div>
 </body>
+
 </html>