From 18de3d9f3270c91314dff9f48bf422412768f4ce Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 18 Feb 2024 09:38:15 -0600
Subject: [PATCH] Fix merge issue

---
 src/data/layers/aca/c.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/data/layers/aca/c.tsx b/src/data/layers/aca/c.tsx
index c401017..0ea6e18 100644
--- a/src/data/layers/aca/c.tsx
+++ b/src/data/layers/aca/c.tsx
@@ -7,7 +7,7 @@ import Row from "components/layout/Row.vue";
 import Spacer from "components/layout/Spacer.vue";
 import Sticky from "components/layout/Sticky.vue";
 import VerticalRule from "components/layout/VerticalRule.vue";
-import { createLayerTreeNode, createResetButton, modifierToFormula } from "data/common";
+import { createLayerTreeNode, createResetButton } from "data/common";
 import { main } from "data/projEntry";
 import themes from "data/themes";
 import { createBar } from "features/bars/bar";
@@ -52,6 +52,7 @@ import { ComputedRef, Ref, computed, ref, unref } from "vue";
 import f from "./f";
 import { ProcessedComputable } from "util/computed";
 import { createAchievement } from "features/achievements/achievement";
+import { InvertibleFormula } from "game/formulas/types";
 
 const id = "c";
 const layer = createLayer(id, () => {
@@ -374,13 +375,13 @@ const layer = createLayer(id, () => {
     ]);
     const conversion = createCumulativeConversion(() => ({
         formula: x =>
-            modifierToFormula(
-                conversionModifier,
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            conversionModifier.getFormula!(
                 x
                     .div(10)
                     .sqrt()
                     .step(1e100, f => f.sqrt())
-            ),
+            ) as InvertibleFormula,
         baseResource: main.points,
         gainResource: noPersist(points),
         roundUpCost: true