fix conflicts issue

Author: Aniket-Engg

apps/remix-ide/src/blockchain/blockchain.tsx

@@ -734,7 +734,7 @@ export class Blockchain extends Plugin {
       (_) => this.executionContext.currentblockGasLimit()
     )
 
-    web3Runner.event.register('transactionBroadcasted', (txhash) => {
+    web3Runner.event.register('transactionBroadcasted', (txhash, isUserOp) => {
       this.executionContext.detectNetwork(async (error, network) => {
         if (error || !network) return
         if (network.name === 'VM') return
@@ -762,7 +762,6 @@ export class Blockchain extends Plugin {
             <a href={userOpLink} target="_blank">
               view on Jiffyscan
             </a>
-            </span>
           )
         } else {
           this.call(

libs/remix-lib/src/execution/txRunnerWeb3.ts

@@ -205,7 +205,7 @@ export class TxRunnerWeb3 {
   async sendUserOp (tx) {
     const localStorageKey = 'smartAccounts'
     const PUBLIC_NODE_URL = "https://rpc.ankr.com/eth_sepolia"
-    const PIMLICO_API_KEY ='pim_J9aaTrRySixhbf3eh3T7dw'
+    const PIMLICO_API_KEY =''
     const BUNDLER_URL = `https://api.pimlico.io/v2/sepolia/rpc?apikey=${PIMLICO_API_KEY}`
     const network = 'sepolia'
     const chain = chains[network]

libs/remix-ui/run-tab/src/lib/actions/account.ts

@@ -104,7 +104,7 @@ export const createNewBlockchainAccount = async (plugin: RunTab, dispatch: React
 export const createSmartAccount = async (plugin: RunTab, dispatch: React.Dispatch<any>) => {
   const localStorageKey = 'smartAccounts'
   const PUBLIC_NODE_URL = "https://rpc.ankr.com/eth_sepolia"
-  const PIMLICO_API_KEY ='pim_J9aaTrRySixhbf3eh3T7dw'
+  const PIMLICO_API_KEY =''
   const BUNDLER_URL = `https://api.pimlico.io/v2/sepolia/rpc?apikey=${PIMLICO_API_KEY}`
   const safeAddresses: string[] = Object.keys(plugin.REACT_API.smartAccounts)
   let salt