[Fix] Conflicts

Assets/Scripts/Shop/ShopModel.cs

@@ -49,7 +49,7 @@ namespace YachtDice.Shop
                 case ModifierDefinition modifier:
                     inventoryModel.AddModifier(modifier);
                     break;
-                case DiceDefinitionSO dice:
+                case DiceDefinition dice:
                     diceCollection.Add(dice);
                     break;
             }