diff --git a/nym-wallet/src/context/main.tsx b/nym-wallet/src/context/main.tsx
index 383e598ad5..af965b79a0 100644
--- a/nym-wallet/src/context/main.tsx
+++ b/nym-wallet/src/context/main.tsx
@@ -64,10 +64,7 @@ export type TAppContext = {
   handleShowTerminal: () => void;
   signInWithPassword: (password: string) => void;
   logOut: () => void;
-<<<<<<< HEAD
-=======
   keepState: () => Promise<void>;
->>>>>>> master
   printBalance: string;
   printVestedBalance?: string; // spendable vested token
 };