diff --git a/module/actor.js b/module/actor.js
index 48d084b9..9d7fade3 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -1778,15 +1778,11 @@ export class RdDActor extends Actor {
   {
     let armeItem = this.getOwnedItem(armeId); // Item.data.data !
     console.log("Going to PARY !!!!!!!!!", armeItem, attackerRoll.diffLibre);    
-<<<<<<< HEAD
     if (armeItem.type == 'competencecreature') {
-      this.rollCompetence(  armeItem.name, armeItem.data, attackerRoll, attacker);
+      this.rollCompetenceCombat(  armeItem.name, armeItem.data, attackerRoll, attacker);
     }  else {
-      this.rollCompetence(  armeItem.data.data.competence, armeItem.data, attackerRoll, attacker);
+      this.rollCompetenceCombat(  armeItem.data.data.competence, armeItem.data, attackerRoll, attacker);
     }
-=======
-    this.rollCompetenceCombat(  armeItem.data.data.competence, armeItem.data, attackerRoll, attacker);
->>>>>>> e2644f1 (Séparation compétences/combat)
   }
   
   /* -------------------------------------------- */  
diff --git a/module/rdd-calendrier.js b/module/rdd-calendrier.js
index 9f825368..409634c4 100644
--- a/module/rdd-calendrier.js
+++ b/module/rdd-calendrier.js
@@ -58,7 +58,7 @@ export class RdDCalendrier extends Application {
         this.rebuildListeNombreAstral();
       }
     }
-    console.log(this.calendrier, this.calendrierPos);
+    console.log(this.calendrier, this.calendrierPos, this.listeNombreAstral);
   }