diff --git a/odex25_ensan/odex_benefit/models/ir_attachment_inherit.py b/odex25_ensan/odex_benefit/models/ir_attachment_inherit.py
index 3d9cd80cd..8311e0243 100644
--- a/odex25_ensan/odex_benefit/models/ir_attachment_inherit.py
+++ b/odex25_ensan/odex_benefit/models/ir_attachment_inherit.py
@@ -22,11 +22,8 @@ class BenefitAttachment(models.Model):
     # fields to management required and delete records in benefit attachment
     is_required = fields.Boolean(string='Is Required?')
     is_default = fields.Boolean(string='Is Default?')
-<<<<<<< HEAD
     mother_grant_benefit_id = fields.Many2one('grant.benefit', string='Mother Grant Benefit')
-=======
     show_in_portal = fields.Boolean(default=True)
->>>>>>> 04481aa674a7a77bd6f957f5c0bd2802a45c2978
 
     def action_preview_attachment(self):
         # Custom function to open the preview