diff --git a/packages/nextjs/contracts/deployedContracts.ts b/packages/nextjs/contracts/deployedContracts.ts
index 97aa1f9e..4ac356b3 100644
--- a/packages/nextjs/contracts/deployedContracts.ts
+++ b/packages/nextjs/contracts/deployedContracts.ts
@@ -7,11 +7,7 @@ import { GenericContractsDeclaration } from "~~/utils/scaffold-eth/contract";
 const deployedContracts = {
   690: {
     Game: {
-<<<<<<< HEAD
       address: "0x4FB8395E1B22E44b498A02fd2eb5a5C49f1DadF1",
-=======
-      address: "0x60c1aebb9150690Ff9F0025d603041E83141eD9a",
->>>>>>> 58607be (build for drops contract and client)
       abi: [
         {
           inputs: [