diff --git a/app/Models/TicketMasterModel.php b/app/Models/TicketMasterModel.php
index ab41a1fe..51896dbc 100644
--- a/app/Models/TicketMasterModel.php
+++ b/app/Models/TicketMasterModel.php
@@ -12,15 +12,6 @@ class TicketMasterModel extends Model
     protected $returnType       = 'array';
     protected $useSoftDeletes   = false;
     protected $protectFields    = true;
-<<<<<<< HEAD
-    protected $allowedFields    = ['id', 'ticket_type_id', 'claim_status_id', 'acm_id', 'insurer_id',
-     'tpa_id', 'client_id', 'priority', 'policy_no', 'emp_code', 'tpa_no', 'emp_name', 'insured_name', 
-     'relationship', 'emp_mobile', 'emp_mail', 'mode_of_intimation', 'claim_type', 'hospital_name', 
-     'doa', 'dod', 'claim_amount', 'pod_no', 'created_by', 'updated_by', 'created_at', 'updated_at',
-      'date_of_join', 'date_of_incep', 'dob', 'date_of_accident', 'date_of_death', 'date_of_intimat',
-       'si_amt','claim_number,is_active'
-    ];  
-=======
     protected $allowedFields = [
         'id',
         'ticket_type_id',
@@ -60,7 +51,6 @@ class TicketMasterModel extends Model
         'claim_number'
     ];
       
->>>>>>> 3a4f7b1e836fc71f477cb6ad32a635dcae0192d0
     
     // Callbacks
     protected $allowCallbacks       = true;