diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv
index 6a0232912eaea8f50907056597c2b6f4191e0511..d2f220c5a1e1675964c06edb5df0db0fdc7c4247 100644
--- a/security/ir.model.access.csv
+++ b/security/ir.model.access.csv
@@ -1,9 +1,4 @@
 id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
-<<<<<<< HEAD
 "access_acc_repartition_keys_group_operation_superadmin","acc_repartition_keys group_operation_superadmin","model_acc_repartition_keys","oacc.group_operation_superadmin",1,1,1,0
 "access_acc_repartition_keys_wizard_group_operation_superadmin","acc_repartition_keys_wizard group_operation_superadmin","model_acc_repartition_keys_wizard","oacc.group_operation_superadmin",1,1,1,1
 
-=======
-"access_acc_repartition_keys_group_operation_admin","acc_repartition_keys group_operation_admin","model_acc_repartition_keys","oacc.group_operation_admin",1,1,1,0
-"access_acc_repartition_keys_wizard_group_operation_admin","acc_repartition_keys_wizard group_operation_admin","model_acc_repartition_keys_wizard","oacc.group_operation_admin",1,1,1,1
->>>>>>> f8f50dae1c02fa6e972c2873b9ef1d6bf5f0efdc