Fix conflict

module/data/item/armor.mjs

@@ -9,7 +9,8 @@ export default class DHArmor extends BaseDataItem {
             label: 'TYPES.Item.armor',
             type: 'armor',
             hasDescription: true,
-            isQuantifiable: true
+            isQuantifiable: true,
+            isInventoryItem: true,
         });
     }
 

module/data/item/base.mjs

@@ -7,6 +7,7 @@ import { actionsTypes } from '../action/_module.mjs';
  * @property {string} type - The system type that this data model represents.
  * @property {boolean} hasDescription - Indicates whether items of this type have description field
  * @property {boolean} isQuantifiable - Indicates whether items of this type have quantity field
+ * @property {boolean} isInventoryItem- Indicates whether items of this type is a Inventory Item
  */
 
 const fields = foundry.data.fields;
@@ -18,7 +19,8 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
             label: 'Base Item',
             type: 'base',
             hasDescription: false,
-            isQuantifiable: false
+            isQuantifiable: false,
+            isInventoryItem: false,
         };
     }
 

module/data/item/consumable.mjs

@@ -8,7 +8,8 @@ export default class DHConsumable extends BaseDataItem {
             label: 'TYPES.Item.consumable',
             type: 'consumable',
             hasDescription: true,
-            isQuantifiable: true
+            isQuantifiable: true,
+            isInventoryItem: true,
         });
     }
 

module/data/item/miscellaneous.mjs

@@ -8,7 +8,8 @@ export default class DHMiscellaneous extends BaseDataItem {
             label: 'TYPES.Item.miscellaneous',
             type: 'miscellaneous',
             hasDescription: true,
-            isQuantifiable: true
+            isQuantifiable: true,
+            isInventoryItem: true,
         });
     }
 

module/data/item/weapon.mjs

@@ -12,10 +12,8 @@ export default class DHWeapon extends BaseDataItem {
             type: 'weapon',
             hasDescription: true,
             isQuantifiable: true,
-            embedded: {
-                feature: 'featureTest'
-            },
-            hasInitialAction: true
+            isInventoryItem: true,
+            hasInitialAction: true,
         });
     }