From a55f99daed57f48d20e3ab0d1134396309196561 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Wed, 17 May 2023 00:01:28 -0500
Subject: [PATCH] Fix merge conflicts

---
 src/features/conversion.ts    | 3 ++-
 src/game/formulas/formulas.ts | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/features/conversion.ts b/src/features/conversion.ts
index aa19839..78ad7cd 100644
--- a/src/features/conversion.ts
+++ b/src/features/conversion.ts
@@ -1,4 +1,4 @@
-import type { OptionsFunc, Replace } from "features/feature";
+import type { CoercableComponent, OptionsFunc, Replace } from "features/feature";
 import { setDefault } from "features/feature";
 import type { Resource } from "features/resources/resource";
 import Formula from "game/formulas/formulas";
@@ -12,6 +12,7 @@ import { createLazyProxy } from "util/proxies";
 import type { Ref } from "vue";
 import { computed, unref } from "vue";
 import { GenericDecorator } from "./decorators/common";
+import { createBooleanRequirement } from "game/requirements";
 
 /** An object that configures a {@link Conversion}. */
 export interface ConversionOptions {
diff --git a/src/game/formulas/formulas.ts b/src/game/formulas/formulas.ts
index 37410cb..2bd34ac 100644
--- a/src/game/formulas/formulas.ts
+++ b/src/game/formulas/formulas.ts
@@ -2,7 +2,7 @@ import { Resource } from "features/resources/resource";
 import { NonPersistent } from "game/persistence";
 import Decimal, { DecimalSource, format } from "util/bignum";
 import { Computable, ProcessedComputable, convertComputable } from "util/computed";
-import { Ref, computed, ref, unref } from "vue";
+import { ComputedRef, Ref, computed, ref, unref } from "vue";
 import * as ops from "./operations";
 import type {
     EvaluateFunction,