Fix some merge issues

src/data/common.tsx

@@ -5,9 +5,10 @@ import type { GenericConversion } from "features/conversion";
 import type { CoercableComponent, JSXFunction, OptionsFunc, Replace } from "features/feature";
 import { jsx, setDefault } from "features/feature";
 import { GenericMilestone } from "features/milestones/milestone";
-import { displayResource } from "features/resources/resource";
+import { displayResource, Resource } from "features/resources/resource";
 import type { GenericTree, GenericTreeNode, TreeNode, TreeNodeOptions } from "features/trees/tree";
 import { createTreeNode } from "features/trees/tree";
+import { GenericFormula } from "game/formulas";
 import type { Modifier } from "game/modifiers";
 import type { Persistent } from "game/persistence";
 import { DefaultValue, persistent } from "game/persistence";
@@ -25,7 +26,6 @@ import { convertComputable, processComputable } from "util/computed";
 import { getFirstFeature, renderColJSX, renderJSX } from "util/vue";
 import type { ComputedRef, Ref } from "vue";
 import { computed, unref } from "vue";
-import Formula, { GenericFormula } from "game/formulas";
 import "./common.css";
 
 /** An object that configures a {@link ResetButton} */

src/util/vue.tsx

@@ -8,7 +8,6 @@ import {
     jsx,
     Visibility
 } from "features/feature";
-import settings from "game/settings";
 import type { ProcessedComputable } from "util/computed";
 import { DoNotCache } from "util/computed";
 import type { Component, ComputedRef, DefineComponent, PropType, Ref, ShallowRef } from "vue";

tests/game/formulas.test.ts

@@ -930,7 +930,7 @@ describe("Custom Formulas", () => {
                 new Formula({
                     inputs: [1],
                     evaluate: () => 10,
-                    integrate: val => val ?? 20
+                    integrate: (val, v1) => val ?? 20
                 }).evaluateIntegral()
             ).compare_tolerance(20));
         test("Two inputs integrates correctly", () =>
@@ -958,7 +958,7 @@ describe("Custom Formulas", () => {
                 new Formula({
                     inputs: [1],
                     evaluate: () => 10,
-                    invertIntegral: val => 1,
+                    invertIntegral: (val, v1) => 1,
                     hasVariable: true
                 }).invertIntegral(8)
             ).compare_tolerance(1));