diff --git a/packages/starknet-snap/snap.manifest.json b/packages/starknet-snap/snap.manifest.json
index e5c905ab..170837ee 100644
--- a/packages/starknet-snap/snap.manifest.json
+++ b/packages/starknet-snap/snap.manifest.json
@@ -7,11 +7,7 @@
     "url": "https://github.com/ConsenSys/starknet-snap.git"
   },
   "source": {
-<<<<<<< HEAD
-    "shasum": "iWfHvJyvoqFsf3POJ0pkO+gCh6MjL4HZLUI36IPWD7E=",
-=======
-    "shasum": "n98JYVZFBDx4LYHqusYAftu/diScJU/ePb8FTYHZXsU=",
->>>>>>> main
+    "shasum": "kl5iM2GRyXtFYwezb2vvrh2iTNC4Gw4K1I3PVOttXJ4=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",
diff --git a/packages/starknet-snap/test/src/executeTxn.test.ts b/packages/starknet-snap/test/src/executeTxn.test.ts
index 9c579be2..667c0eab 100644
--- a/packages/starknet-snap/test/src/executeTxn.test.ts
+++ b/packages/starknet-snap/test/src/executeTxn.test.ts
@@ -294,6 +294,7 @@ describe('Test function: executeTxn', function () {
   });
 
   it('should return false if user rejected to sign the transaction', async function () {
+    sandbox.stub(utils, 'isAccountDeployed').resolves(true);
     walletStub.rpcStubs.snap_dialog.resolves(false);
     const stub = sandbox.stub(utils, 'executeTxn').resolves({
       transaction_hash: 'transaction_hash',