diff --git a/app/src/pages/_app.tsx b/app/src/pages/_app.tsx
index b4ea6d0..533f4e8 100644
--- a/app/src/pages/_app.tsx
+++ b/app/src/pages/_app.tsx
@@ -1,15 +1,3 @@
-<<<<<<< HEAD
-import '../styles/globals.css';
-import '@rainbow-me/rainbowkit/styles.css';
-import type { AppProps } from 'next/app';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { WagmiProvider } from 'wagmi';
-import { RainbowKitProvider, midnightTheme } from '@rainbow-me/rainbowkit';
-import { config } from '../wagmi';
-import { Texturina } from 'next/font/google'
-import PlayerProvider from '../providers/PlayerProvider';
-import ModalProvider from '../providers/ModalProvider';
-=======
 import "../styles/globals.css";
 import "../styles/pixelatedBorders.scss";
 import "@rainbow-me/rainbowkit/styles.css";
@@ -20,7 +8,8 @@ import { RainbowKitProvider, midnightTheme } from "@rainbow-me/rainbowkit";
 import { config } from "../wagmi";
 import { Press_Start_2P, Texturina } from "next/font/google";
 import PlayerProvider from "../providers/PlayerProvider";
->>>>>>> main
+import ModalProvider from '../providers/ModalProvider';
+
 
 const client = new QueryClient();
 const font = Texturina({ weight: ["400"], subsets: ["latin"] });