diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 64fccf30..9a027254 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -162,9 +162,8 @@ export class RdDUtility  {
 
     return loadTemplates(templatePaths);
   }
-<<<<<<< HEAD
   
-  /************************************************************************************/
+  /* -------------------------------------------- */
   static buildConteneur( objet, niveau ) {
     if (!niveau) niveau = 1;
     let prefix = "";
@@ -212,8 +211,6 @@ export class RdDUtility  {
     }
     return tableRes;
   }
-=======
->>>>>>> fb52e394e7e17fad20a0bdaa2ae9ea00c03a465e
 
   /* -------------------------------------------- */
   static getLevelCategory( )  
diff --git a/system.json b/system.json
index 3343ce64..4046ead6 100644
--- a/system.json
+++ b/system.json
@@ -5,7 +5,7 @@
   "version": "0.9.32",
   "minimumCoreVersion": "0.7.5",
   "compatibleCoreVersion": "0.7.6",
-  "templateVersion": 43,
+  "templateVersion": 44,
   "author": "LeRatierBretonnien",
   "esmodules": [ "module/rdd-main.js", "module/hook-renderChatLog.js" ],
   "styles": ["styles/simple.css"],