diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 4c16459a11bd..16929178c816 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -643,7 +643,6 @@ class Invoice extends EntityModel implements BalanceAffecting
     public function statusLabel()
     {
         return static::calcStatusLabel($this->invoice_status->name, $this->statusClass(), $this->getEntityType(), $this->quote_invoice_id);
->>>>>>> release-3.0.0
     }
 
     /**