fix: Merge conflict errors from v2-beta (#622)

* fix: merge conflict errors

* fix: merge conflict errors

Author: arcoraven

src/server/routes/contract/extensions/erc20/write/claimTo.ts

@@ -1,7 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { Address } from "thirdweb";
+import { Address, Hex } from "thirdweb";
 import { claimTo } from "thirdweb/extensions/erc20";
 import { resolvePromisedValue } from "thirdweb/utils";
 import { getContractV5 } from "../../../../../../utils/cache/getContractv5";

src/server/routes/index.ts

@@ -1,8 +1,5 @@
 import { FastifyInstance } from "fastify";
-<<<<<<< HEAD
 import { getTransactionDetails } from "./admin/transaction";
-=======
->>>>>>> origin/main
 import { createAccessToken } from "./auth/access-tokens/create";
 import { getAllAccessTokens } from "./auth/access-tokens/getAll";
 import { revokeAccessToken } from "./auth/access-tokens/revoke";

src/server/routes/system/queue.ts

@@ -1,17 +1,11 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-<<<<<<< HEAD
 import { TransactionDB } from "../../../db/transactions/db";
 import { getPercentile } from "../../../utils/math";
 import { MinedTransaction } from "../../../utils/transaction/types";
 import { MineTransactionQueue } from "../../../worker/queues/mineTransactionQueue";
 import { SendTransactionQueue } from "../../../worker/queues/sendTransactionQueue";
-=======
-import { prisma } from "../../../db/client";
-import { getQueueStatus } from "../../../db/transactions/getQueueStatus";
-import { getPercentile } from "../../../utils/math";
->>>>>>> origin/main
 import { standardResponseSchema } from "../../schemas/sharedApiSchemas";
 
 const responseBodySchema = Type.Object({