diff --git a/core/genesis.go b/core/genesis.go
index e18f7c5f43..25b54cdfbd 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -74,7 +74,7 @@ type Genesis struct {
 	ExcessBlobGas       *uint64      `json:"excessBlobGas"`                 // EIP-4844
 	BlobGasUsed         *uint64      `json:"blobGasUsed"`                   // EIP-4844
 	BlockAccessListHash *common.Hash `json:"blockAccessListHash,omitempty"` // EIP-7928
-	SlotNumber    *uint64     `json:"slotNumber"`    // EIP-7843
+	SlotNumber          *uint64      `json:"slotNumber"`                    // EIP-7843
 }
 
 // copy copies the genesis.
@@ -124,11 +124,8 @@ func ReadGenesis(db ethdb.Database) (*Genesis, error) {
 	genesis.BaseFee = genesisHeader.BaseFee
 	genesis.ExcessBlobGas = genesisHeader.ExcessBlobGas
 	genesis.BlobGasUsed = genesisHeader.BlobGasUsed
-<<<<<<< HEAD
 	genesis.BlockAccessListHash = genesisHeader.BlockAccessListHash
-=======
 	genesis.SlotNumber = genesisHeader.SlotNumber
->>>>>>> 06c09385b5 (core/vm: implement eip-7843)
 
 	return &genesis, nil
 }
diff --git a/core/parallel_state_processor.go b/core/parallel_state_processor.go
index 6a9c91750f..a1c07bfd20 100644
--- a/core/parallel_state_processor.go
+++ b/core/parallel_state_processor.go
@@ -3,15 +3,16 @@ package core
 import (
 	"cmp"
 	"fmt"
+	"runtime"
+	"slices"
+	"time"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/types/bal"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"golang.org/x/sync/errgroup"
-	"runtime"
-	"slices"
-	"time"
 )
 
 // ProcessResultWithMetrics wraps ProcessResult with some metrics that are
@@ -270,8 +271,7 @@ func (p *ParallelStateProcessor) execTx(block *types.Block, tx *types.Transactio
 	gp := new(GasPool)
 	gp.SetGas(block.GasLimit())
 	db.SetTxContext(tx.Hash(), txIdx)
-	var gasUsed uint64
-	receipt, err := ApplyTransactionWithEVM(msg, gp, db, block.Number(), block.Hash(), context.Time, tx, &gasUsed, evm)
+	receipt, _, err := ApplyTransactionWithEVM(msg, gp, db, block.Number(), block.Hash(), context.Time, tx, 0, evm)
 	if err != nil {
 		err := fmt.Errorf("could not apply tx %d [%v]: %w", txIdx, tx.Hash().Hex(), err)
 		return &txExecResult{err: err}